Ticket #453: ticket453.patch

js/Story.js

@@ -216 +216 @@
                         tiddlerElem.setAttribute("tags",tiddler.tags.join(" "));
                         tiddlerElem.setAttribute("tiddler",title);
                         tiddlerElem.setAttribute("template",template);
-                        var me = this;
                         tiddlerElem.onmouseover = this.onTiddlerMouseOver;
                         tiddlerElem.onmouseout = this.onTiddlerMouseOut;
                         tiddlerElem.ondblclick = this.onTiddlerDblClick;
                         tiddlerElem[window.event?"onkeydown":"onkeypress"] = this.onTiddlerKeyPress;
-                        var html = this.getTemplateForTiddler(title,template,tiddler);
-                        tiddlerElem.innerHTML = html;
+                        tiddlerElem.innerHTML = this.getTemplateForTiddler(title,template,tiddler);
                         applyHtmlMacros(tiddlerElem,tiddler);
                         if(store.getTaggedTiddlers(title).length > 0)
                                 addClass(tiddlerElem,"isTag");
                         else
                                 removeClass(tiddlerElem,"isTag");
-                        if(!store.tiddlerExists(title)) {
-                                if(store.isShadowTiddler(title))
-                                        addClass(tiddlerElem,"shadow");
-                                else
-                                        addClass(tiddlerElem,"missing");
-                        } else {
+                        if(store.tiddlerExists(title)) {
                                 removeClass(tiddlerElem,"shadow");
                                 removeClass(tiddlerElem,"missing");
+                        } else {
+                                addClass(tiddlerElem,store.isShadowTiddler(title) ? "shadow" : "missing");
                         }
                         if(customFields)
                                 this.addCustomFields(tiddlerElem,customFields);
@@ -634 +629 @@
                 var name = config.notifyTiddlers[i].name;
                 switch(name) {
                 case "PageTemplate":
-                        config.refreshers.pageTemplate = replaceNotification(i,config.refreshers.pageTemplate,getSlice(theme,name));
+                        config.refresherData.pageTemplate = replaceNotification(i,config.refresherData.pageTemplate,getSlice(theme,name));
                         break;
                 case "StyleSheet":
-                        removeStyleSheet(config.refreshers.styleSheet);
-                        config.refreshers.styleSheet = replaceNotification(i,config.refreshers.styleSheet,getSlice(theme,name));
+                        removeStyleSheet(config.refresherData.styleSheet);
+                        config.refresherData.styleSheet = replaceNotification(i,config.refresherData.styleSheet,getSlice(theme,name));
                         break;
                 case "ColorPalette":
-                        config.refreshers.colorPalette = replaceNotification(i,config.refreshers.colorPalette,getSlice(theme,name));
+                        config.refresherData.colorPalette = replaceNotification(i,config.refresherData.colorPalette,getSlice(theme,name));
                         break;
                 default:
                         break;

js/Refresh.js

@@ -2 +2 @@
 //-- Refresh mechanism
 //--
 
+//# refresher functions
 config.refreshers = {
         link: function(e,changeList)
                 {
@@ -42 +43 @@
                 if(macro && macro.refresh)
                         macro.refresh(e,params);
                 return true;
-                },
-        styleSheet: "StyleSheet", 
-        defaultStyleSheet: "StyleSheet", 
-        pageTemplate: "PageTemplate", 
-        defaultPageTemplate: "PageTemplate", 
-        colorPalette: "ColorPalette", 
-        defaultColorPalette: "ColorPalette" 
+                }
 };
 
+config.refresherData = {
+        styleSheet: "StyleSheet",
+        defaultStyleSheet: "StyleSheet",
+        pageTemplate: "PageTemplate",
+        defaultPageTemplate: "PageTemplate",
+        colorPalette: "ColorPalette",
+        defaultColorPalette: "ColorPalette"
+};
+
 function refreshElements(root,changeList)
 {
         var nodes = root.childNodes;
@@ -104 +108 @@
         var wrapper = document.getElementById("contentWrapper");
 
         isAvailable = function(title) { 
-                var s = title ? title.indexOf(config.textPrimitives.sectionSeparator) : -1; 
+                var s = title ? title.indexOf(config.textPrimitives.sectionSeparator) : -1;
                 if(s!=-1) 
                         title = title.substr(0,s); 
-                return store.tiddlerExists(title) || store.isShadowTiddler(title); 
+                return store.tiddlerExists(title) || store.isShadowTiddler(title);
         };
         //# protect against non-existent pageTemplate
         if(!title || !isAvailable(title))
-                title = config.refreshers.pageTemplate;
+                title = config.refresherData.pageTemplate;
         if(!isAvailable(title))
-                title = config.refreshers.defaultPageTemplate; //# this one is always avaialable
+                title = config.refresherData.defaultPageTemplate; //# this one is always avaialable
         html = store.getRecursiveTiddlerText(title,null,10);
         wrapper.innerHTML = html;
         applyHtmlMacros(wrapper);
@@ -169 +173 @@
         refreshDisplay();
         refreshStyles("StyleSheetLayout");
         refreshStyles("StyleSheetColors");
-        refreshStyles(config.refreshers.styleSheet);
+        refreshStyles(config.refresherData.styleSheet);
         refreshStyles("StyleSheetPrint");
 }