Changeset 3535

Timestamp:

16/02/08 17:20:44 (7 months ago)

Author:

JeremyRuston

Message:

Improved encapsulation of story idPrefix (ticket #475)

Files:

• Trunk/core/js/Commands.js (modified) (1 diff)
• Trunk/core/js/NewTiddler.js (modified) (1 diff)
• Trunk/core/js/Story.js (modified) (11 diffs)

Trunk/core/js/Commands.js

@@ -18 +18 @@
-{
-        clearMessage();
-document.getElementById(story.idPrefix + 
+story.getTiddler(
-        var fields = tiddlerElem.getAttribute("tiddlyFields");
-        story.displayTiddler(null,title,DEFAULT_EDIT_TEMPLATE,false,null,fields);

Trunk/core/js/NewTiddler.js

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

Trunk/core/js/Story.js

@@ -55 +55 @@
-        var title = (tiddler instanceof Tiddler)? tiddler.title : tiddler;  
-        var place = document.getElementById(this.container);
-document.getElementById(this.idPrefix + 
+this.getTiddler(
-        if(tiddlerElem) {
-                if(toggle)
@@ -112 +112 @@
-Story.prototype.createTiddler = function(place,before,title,template,customFields)
-{
-idPrefix + title
+tiddlerId(title)
-        tiddlerElem.setAttribute("refresh","tiddler");
-        if(customFields)
@@ -193 +193 @@
-Story.prototype.refreshTiddler = function(title,template,force,customFields,defaultText)
-{
-document.getElementById(this.idPrefix + 
+this.getTiddler(
-        if(tiddlerElem) {
-                if(tiddlerElem.getAttribute("dirty") == "true" && !force)
@@ -347 +347 @@
-Story.prototype.getTiddlerField = function(title,field)
-{
-document.getElementById(this.idPrefix + 
+this.getTiddler(
-        var e = null;
-        if(tiddlerElem != null) {
@@ -377 +377 @@
-Story.prototype.blurTiddler = function(title)
-{
-document.getElementById(this.idPrefix + 
+this.getTiddler(
-        if(tiddlerElem != null && tiddlerElem.focus && tiddlerElem.blur) {
-                tiddlerElem.focus();
@@ -410 +410 @@
-Story.prototype.closeTiddler = function(title,animate,unused)
-{
-document.getElementById(this.idPrefix + 
+this.getTiddler(
-        if(tiddlerElem != null) {
-                clearMessage();
@@ -436 +436 @@
-Story.prototype.setDirty = function(title,dirty)
-{
-document.getElementById(this.idPrefix + 
+this.getTiddler(
-        if(tiddlerElem != null)
-                tiddlerElem.setAttribute("dirty",dirty ? "true" : "false");
@@ -444 +444 @@
-Story.prototype.isDirty = function(title)
-{
-document.getElementById(this.idPrefix + 
+this.getTiddler(
-        if(tiddlerElem != null)
-                return tiddlerElem.getAttribute("dirty") == "true";
@@ -528 +528 @@
-Story.prototype.hasChanges = function(title)
-{
-document.getElementById(this.idPrefix + 
+this.getTiddler(
-        if(e != null) {
-                var fields = {};
@@ -549 +549 @@
-Story.prototype.saveTiddler = function(title,minorUpdate)
-{
-document.getElementById(this.idPrefix + 
+this.getTiddler(
-        if(tiddlerElem != null) {
-                var fields = {};
@@ -653 +653 @@
-};
-
+//# 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));
+}
+