Changeset 686

Timestamp:

09/07/06 13:16:45 (2 years ago)

Author:

JeremyRuston

Message:

Refresh sliders when underlying tiddler changes (ticket #144)

Location:

Branches/2.1/core/js

Files:

• Macros.js (modified) (1 diff)
• Refresh.js (modified) (5 diffs)

Branches/2.1/core/js/Macros.js

@@ -309 +309 @@
         var panel = this.createSlider(place,params[0],params[2],params[3]);
         var text = store.getTiddlerText(params[1]);
+        panel.setAttribute("refresh", "content");
+        panel.setAttribute("tiddler", params[1]);
         if(text)
                 wikify(text,panel,null,store.getTiddler(params[1]));

Branches/2.1/core/js/Refresh.js

@@ -8 +8 @@
                 var title = e.getAttribute("tiddlyLink");
                 refreshTiddlyLink(e,title);
+                return true;
                 },
         
@@ -18 +19 @@
                 else
                         refreshElements(e,changeList);
+                return true;
                 },
 
@@ -28 +30 @@
                         removeChildren(e);
                         wikify(store.getTiddlerText(title,title),e);
+                        return true;
                         }
+                else
+                        return false;
                 },
 
@@ -39 +44 @@
                 if(macro && macro.refresh)
                         macro.refresh(e,params);
+                return true;
                 }
 };
@@ -53 +59 @@
                         type = null;
                 var refresher = config.refreshers[type];
-                if(refresher == undefined)
-                        {
-                        if(e.hasChildNodes())
-                                refreshElements(e,changeList);
-                        }
-                else
-                        refresher(e,changeList);
+                var refreshed = false;
+                if(refresher != undefined)
+                        refreshed = refresher(e,changeList);
+                if(e.hasChildNodes() && !refreshed)
+                        refreshElements(e,changeList);
                 }
 }