Ticket #475: ticket475.patch

Commands.js

@@ -17 +17 @@
 config.commands.editTiddler.handler = function(event,src,title)
 {
         clearMessage();
-        var tiddlerElem = document.getElementById(story.idPrefix + title);
+        var tiddlerElem = story.getTiddler(title);
         var fields = tiddlerElem.getAttribute("tiddlyFields");
         story.displayTiddler(null,title,DEFAULT_EDIT_TEMPLATE,false,null,fields);
         story.focusTiddler(title,"text");

NewTiddler.js

@@ -44 +44 @@
         var template = this.getAttribute("newTemplate");
         var customFields = this.getAttribute("customFields");
         story.displayTiddler(null,title,template,false,null,null);
-        var tiddlerElem = document.getElementById(story.idPrefix + title);
+        var tiddlerElem = story.getTiddler(title);
         if(customFields)
                 story.addCustomFields(tiddlerElem,customFields);
         var text = this.getAttribute("newText");

Story.js

@@ -54 +54 @@
 {
         var title = (tiddler instanceof Tiddler)? tiddler.title : tiddler;  
         var place = document.getElementById(this.container);
-        var tiddlerElem = document.getElementById(this.idPrefix + title);
+        var tiddlerElem = this.getTiddler(title);
         if(tiddlerElem) {
                 if(toggle)
                         this.closeTiddler(title,true);
@@ -111 +111 @@
 //# customFields - an optional list of name:"value" pairs to be assigned as tiddler fields
 Story.prototype.createTiddler = function(place,before,title,template,customFields)
 {
-        var tiddlerElem = createTiddlyElement(null,"div",this.idPrefix + title,"tiddler");
+        var tiddlerElem = createTiddlyElement(null,"div",this.tiddlerId(title),"tiddler");
         tiddlerElem.setAttribute("refresh","tiddler");
         if(customFields)
                 tiddlerElem.setAttribute("tiddlyFields",customFields);
@@ -192 +192 @@
 //# defaultText - an optional string to replace the default text for non-existent tiddlers
 Story.prototype.refreshTiddler = function(title,template,force,customFields,defaultText)
 {
-        var tiddlerElem = document.getElementById(this.idPrefix + title);
+        var tiddlerElem = this.getTiddler(title);
         if(tiddlerElem) {
                 if(tiddlerElem.getAttribute("dirty") == "true" && !force)
                         return tiddlerElem;
@@ -346 +346 @@
 //# or null if it found no edit field at all
 Story.prototype.getTiddlerField = function(title,field)
 {
-        var tiddlerElem = document.getElementById(this.idPrefix + title);
+        var tiddlerElem = this.getTiddler(title);
         var e = null;
         if(tiddlerElem != null) {
                 var children = tiddlerElem.getElementsByTagName("*");
@@ -376 +376 @@
 //# Ensures that a specified tiddler does not have the focus
 Story.prototype.blurTiddler = function(title)
 {
-        var tiddlerElem = document.getElementById(this.idPrefix + title);
+        var tiddlerElem = this.getTiddler(title);
         if(tiddlerElem != null && tiddlerElem.focus && tiddlerElem.blur) {
                 tiddlerElem.focus();
                 tiddlerElem.blur();
@@ -409 +409 @@
 //# animate - whether to perform animations
 Story.prototype.closeTiddler = function(title,animate,unused)
 {
-        var tiddlerElem = document.getElementById(this.idPrefix + title);
+        var tiddlerElem = this.getTiddler(title);
         if(tiddlerElem != null) {
                 clearMessage();
                 this.scrubTiddler(tiddlerElem);
@@ -435 +435 @@
 //# dirty - new boolean status of flag
 Story.prototype.setDirty = function(title,dirty)
 {
-        var tiddlerElem = document.getElementById(this.idPrefix + title);
+        var tiddlerElem = this.getTiddler(title);
         if(tiddlerElem != null)
                 tiddlerElem.setAttribute("dirty",dirty ? "true" : "false");
 };
@@ -443 +443 @@
 //# Is a particular tiddler dirty (with unsaved changes)?
 Story.prototype.isDirty = function(title)
 {
-        var tiddlerElem = document.getElementById(this.idPrefix + title);
+        var tiddlerElem = this.getTiddler(title);
         if(tiddlerElem != null)
                 return tiddlerElem.getAttribute("dirty") == "true";
         return null;
@@ -527 +527 @@
 //# title - name of tiddler
 Story.prototype.hasChanges = function(title)
 {
-        var e = document.getElementById(this.idPrefix + title);
+        var e = this.getTiddler(title);
         if(e != null) {
                 var fields = {};
                 this.gatherSaveFields(e,fields);
@@ -548 +548 @@
 //# returns: title of saved tiddler, or null if not saved
 Story.prototype.saveTiddler = function(title,minorUpdate)
 {
-        var tiddlerElem = document.getElementById(this.idPrefix + title);
+        var tiddlerElem = this.getTiddler(title);
         if(tiddlerElem != null) {
                 var fields = {};
                 this.gatherSaveFields(tiddlerElem,fields);
@@ -652 +652 @@
         }
 };
 
+//# generate tiddler ID
+Story.prototype.tiddlerId = function(title)
+{
+    return this.idPrefix + title;
+}
+
+//# retrieve tiddler element
+Story.prototype.getTiddler = function(title)
+{
+    return document.getElementById(this.tiddlerId(title));
+}
+