http://trac.tiddlywiki.org/changeset/12048

FND
2010-04-22 06:51:27 -0700 (Thu, 22 Apr 2010)
277
efficiency and readability enhancements

added shortcuts for numerous references to config.* objects

NB: This was done only where deemed sensible in terms of readability,
not wherever it could have done.

also renamed shortcut from self to me in ImportTiddlers for consistency

---------------

U   Trunk/core/js/Commands.js
U   Trunk/core/js/Import.js
U   Trunk/core/js/ListView.js
U   Trunk/core/js/Manager.js
U   Trunk/core/js/Options.js
U   Trunk/core/js/Saving.js
U   Trunk/core/js/Search.js
U   Trunk/core/js/Sync.js

---------------

Modified: Trunk/core/js/Commands.js
===================================================================
--- Trunk/core/js/Commands.js   2010-04-22 13:24:17 UTC (rev 12047)
+++ Trunk/core/js/Commands.js   2010-04-22 13:51:27 UTC (rev 12048)
@@ -92,6 +92,7 @@
 
 config.commands.syncing.handlePopup = function(popup,title)
 {
+       var me = config.commands.syncing;
        var tiddler = store.fetchTiddler(title);
        if(!tiddler)
                return;
@@ -102,18 +103,18 @@
                serverWorkspace = "";
        if(serverType) {
                var e = createTiddlyElement(popup,"li",null,"popupMessage");
-               e.innerHTML = 
config.commands.syncing.currentlySyncing.format([serverType,serverHost,serverWorkspace]);
+               e.innerHTML = 
me.currentlySyncing.format([serverType,serverHost,serverWorkspace]);
        } else {
-               
createTiddlyElement(popup,"li",null,"popupMessage",config.commands.syncing.notCurrentlySyncing);
+               
createTiddlyElement(popup,"li",null,"popupMessage",me.notCurrentlySyncing);
        }
        if(serverType) {
                
createTiddlyElement(createTiddlyElement(popup,"li",null,"listBreak"),"div");
-               var btn = 
createTiddlyButton(createTiddlyElement(popup,"li"),this.captionUnSync,null,config.commands.syncing.onChooseServer);
+               var btn = 
createTiddlyButton(createTiddlyElement(popup,"li"),this.captionUnSync,null,me.onChooseServer);
                btn.setAttribute("tiddler",title);
                btn.setAttribute("server.type","");
        }
        
createTiddlyElement(createTiddlyElement(popup,"li",null,"listBreak"),"div");
-       
createTiddlyElement(popup,"li",null,"popupMessage",config.commands.syncing.chooseServer);
+       createTiddlyElement(popup,"li",null,"popupMessage",me.chooseServer);
        var feeds = store.getTaggedTiddlers("systemServer","title");
        for(var t=0; t<feeds.length; t++) {
                var f = feeds[t];
@@ -128,11 +129,11 @@
                        feedServerWorkspace = "";
                var caption = f.title;
                if(serverType == feedServerType && serverHost == feedServerHost 
&& serverWorkspace == feedServerWorkspace) {
-                       caption = config.commands.syncing.currServerMarker + 
caption;
+                       caption = me.currServerMarker + caption;
                } else {
-                       caption = config.commands.syncing.notCurrServerMarker + 
caption;
+                       caption = me.notCurrServerMarker + caption;
                }
-               btn = 
createTiddlyButton(createTiddlyElement(popup,"li"),caption,null,config.commands.syncing.onChooseServer);
+               btn = 
createTiddlyButton(createTiddlyElement(popup,"li"),caption,null,me.onChooseServer);
                btn.setAttribute("tiddler",title);
                btn.setAttribute("server.type",feedServerType);
                btn.setAttribute("server.host",feedServerHost);

Modified: Trunk/core/js/Import.js
===================================================================
--- Trunk/core/js/Import.js     2010-04-22 13:24:17 UTC (rev 12047)
+++ Trunk/core/js/Import.js     2010-04-22 13:51:27 UTC (rev 12048)
@@ -29,7 +29,7 @@
 
 config.macros.importTiddlers.restart = function(wizard)
 {
-       var self = config.macros.importTiddlers;
+       var me = config.macros.importTiddlers;
        wizard.addStep(this.step1Title,this.step1Html);
        var s = wizard.getElement("selTypes");
        for(var t in config.adaptors) {
@@ -45,11 +45,11 @@
                e.value = t;
        }
        wizard.setValue("feeds",feeds);
-       s.onchange = self.onFeedChange;
+       s.onchange = me.onFeedChange;
        var fileInput = wizard.getElement("txtBrowse");
-       fileInput.onchange = self.onBrowseChange;
-       fileInput.onkeyup = self.onBrowseChange;
-       wizard.setButtons([{caption: this.openLabel, tooltip: this.openPrompt, 
onClick: self.onOpen}]);
+       fileInput.onchange = me.onBrowseChange;
+       fileInput.onkeyup = me.onBrowseChange;
+       wizard.setButtons([{caption: this.openLabel, tooltip: this.openPrompt, 
onClick: me.onOpen}]);
        wizard.formElem.action = "javascript:;";
        wizard.formElem.onsubmit = function() {
                if(!this.txtPath || this.txtPath.value.length) //# check for 
manually entered path in first step
@@ -133,7 +133,7 @@
 
 config.macros.importTiddlers.onOpen = function(e)
 {
-       var self = config.macros.importTiddlers;
+       var me = config.macros.importTiddlers;
        var wizard = new Wizard(this);
        var fileInput = wizard.getElement("txtPath");
        var url = fileInput.value;
@@ -142,28 +142,28 @@
        wizard.setValue("adaptor",adaptor);
        wizard.setValue("serverType",serverType);
        wizard.setValue("host",url);
-       var ret = adaptor.openHost(url,null,wizard,self.onOpenHost);
+       var ret = adaptor.openHost(url,null,wizard,me.onOpenHost);
        if(ret !== true)
                displayMessage(ret);
-       wizard.setButtons([{caption: self.cancelLabel, tooltip: 
self.cancelPrompt, onClick: self.onCancel}],self.statusOpenHost);
+       wizard.setButtons([{caption: me.cancelLabel, tooltip: me.cancelPrompt, 
onClick: me.onCancel}],me.statusOpenHost);
        return false;
 };
 
 config.macros.importTiddlers.onOpenHost = function(context,wizard)
 {
-       var self = config.macros.importTiddlers;
+       var me = config.macros.importTiddlers;
        var adaptor = wizard.getValue("adaptor");
        if(context.status !== true)
                displayMessage("Error in importTiddlers.onOpenHost: " + 
context.statusText);
-       var ret = 
adaptor.getWorkspaceList(context,wizard,self.onGetWorkspaceList);
+       var ret = 
adaptor.getWorkspaceList(context,wizard,me.onGetWorkspaceList);
        if(ret !== true)
                displayMessage(ret);
-       wizard.setButtons([{caption: self.cancelLabel, tooltip: 
self.cancelPrompt, onClick: self.onCancel}],self.statusGetWorkspaceList);
+       wizard.setButtons([{caption: me.cancelLabel, tooltip: me.cancelPrompt, 
onClick: me.onCancel}],me.statusGetWorkspaceList);
 };
 
 config.macros.importTiddlers.onGetWorkspaceList = function(context,wizard)
 {
-       var self = config.macros.importTiddlers;
+       var me = config.macros.importTiddlers;
        if(context.status !== true)
                displayMessage("Error in importTiddlers.onGetWorkspaceList: " + 
context.statusText);
        wizard.setValue("context",context);
@@ -172,16 +172,16 @@
                workspace = context.workspaces[0].title;
        if(workspace) {
                //# if there is only one workspace, then open it directly
-               var ret = 
context.adaptor.openWorkspace(workspace,context,wizard,self.onOpenWorkspace);
+               var ret = 
context.adaptor.openWorkspace(workspace,context,wizard,me.onOpenWorkspace);
                if(ret !== true)
                        displayMessage(ret);
                wizard.setValue("workspace",workspace);
-               wizard.setButtons([{caption: self.cancelLabel, tooltip: 
self.cancelPrompt, onClick: self.onCancel}],self.statusOpenWorkspace);
+               wizard.setButtons([{caption: me.cancelLabel, tooltip: 
me.cancelPrompt, onClick: me.onCancel}],me.statusOpenWorkspace);
                return;
        }
-       wizard.addStep(self.step2Title,self.step2Html);
+       wizard.addStep(me.step2Title,me.step2Html);
        var s = wizard.getElement("selWorkspace");
-       s.onchange = self.onWorkspaceChange;
+       s.onchange = me.onWorkspaceChange;
        for(var t=0; t<context.workspaces.length; t++) {
                var e = 
createTiddlyElement(s,"option",null,null,context.workspaces[t].title);
                e.value = context.workspaces[t].title;
@@ -200,7 +200,7 @@
                t = wizard.getElement("txtWorkspace");
                t.value = workspace;
        }
-       wizard.setButtons([{caption: self.openLabel, tooltip: self.openPrompt, 
onClick: self.onChooseWorkspace}]);
+       wizard.setButtons([{caption: me.openLabel, tooltip: me.openPrompt, 
onClick: me.onChooseWorkspace}]);
 };
 
 config.macros.importTiddlers.onWorkspaceChange = function(e)
@@ -214,36 +214,36 @@
 
 config.macros.importTiddlers.onChooseWorkspace = function(e)
 {
-       var self = config.macros.importTiddlers;
+       var me = config.macros.importTiddlers;
        var wizard = new Wizard(this);
        var adaptor = wizard.getValue("adaptor");
        var workspace = wizard.getElement("txtWorkspace").value;
        wizard.setValue("workspace",workspace);
        var context = wizard.getValue("context");
-       var ret = 
adaptor.openWorkspace(workspace,context,wizard,self.onOpenWorkspace);
+       var ret = 
adaptor.openWorkspace(workspace,context,wizard,me.onOpenWorkspace);
        if(ret !== true)
                displayMessage(ret);
-       wizard.setButtons([{caption: self.cancelLabel, tooltip: 
self.cancelPrompt, onClick: self.onCancel}],self.statusOpenWorkspace);
+       wizard.setButtons([{caption: me.cancelLabel, tooltip: me.cancelPrompt, 
onClick: me.onCancel}],me.statusOpenWorkspace);
        return false;
 };
 
 config.macros.importTiddlers.onOpenWorkspace = function(context,wizard)
 {
-       var self = config.macros.importTiddlers;
+       var me = config.macros.importTiddlers;
        if(context.status !== true)
                displayMessage("Error in importTiddlers.onOpenWorkspace: " + 
context.statusText);
        var adaptor = wizard.getValue("adaptor");
-       var ret = 
adaptor.getTiddlerList(context,wizard,self.onGetTiddlerList,wizard.getValue("feedTiddlerFilter"));
+       var ret = 
adaptor.getTiddlerList(context,wizard,me.onGetTiddlerList,wizard.getValue("feedTiddlerFilter"));
        if(ret !== true)
                displayMessage(ret);
-       wizard.setButtons([{caption: self.cancelLabel, tooltip: 
self.cancelPrompt, onClick: self.onCancel}],self.statusGetTiddlerList);
+       wizard.setButtons([{caption: me.cancelLabel, tooltip: me.cancelPrompt, 
onClick: me.onCancel}],me.statusGetTiddlerList);
 };
 
 config.macros.importTiddlers.onGetTiddlerList = function(context,wizard)
 {
-       var self = config.macros.importTiddlers;
+       var me = config.macros.importTiddlers;
        if(context.status !== true) {
-               wizard.setButtons([{caption: self.cancelLabel, tooltip: 
self.cancelPrompt, onClick: self.onCancel}],self.errorGettingTiddlerList);
+               wizard.setButtons([{caption: me.cancelLabel, tooltip: 
me.cancelPrompt, onClick: me.onCancel}],me.errorGettingTiddlerList);
                return;
        }
        // Extract data for the listview
@@ -264,18 +264,18 @@
        }
        listedTiddlers.sort(function(a,b) {return a.title < b.title ? -1 : 
(a.title == b.title ? 0 : +1);});
        // Display the listview
-       wizard.addStep(self.step3Title,self.step3Html);
+       wizard.addStep(me.step3Title,me.step3Html);
        var markList = wizard.getElement("markList");
        var listWrapper = document.createElement("div");
        markList.parentNode.insertBefore(listWrapper,markList);
-       var listView = 
ListView.create(listWrapper,listedTiddlers,self.listViewTemplate);
+       var listView = 
ListView.create(listWrapper,listedTiddlers,me.listViewTemplate);
        wizard.setValue("listView",listView);
        wizard.setValue("context",context);
        var txtSaveTiddler = wizard.getElement("txtSaveTiddler");
-       txtSaveTiddler.value = self.generateSystemServerName(wizard);
+       txtSaveTiddler.value = me.generateSystemServerName(wizard);
        wizard.setButtons([
-                       {caption: self.cancelLabel, tooltip: self.cancelPrompt, 
onClick: self.onCancel},
-                       {caption: self.importLabel, tooltip: self.importPrompt, 
onClick: self.doImport}
+                       {caption: me.cancelLabel, tooltip: me.cancelPrompt, 
onClick: me.onCancel},
+                       {caption: me.importLabel, tooltip: me.importPrompt, 
onClick: me.doImport}
                ]);
 };
 
@@ -290,10 +290,10 @@
 
 config.macros.importTiddlers.saveServerTiddler = function(wizard)
 {
-       var self = config.macros.importTiddlers;
+       var me = config.macros.importTiddlers;
        var txtSaveTiddler = wizard.getElement("txtSaveTiddler").value;
        if(store.tiddlerExists(txtSaveTiddler)) {
-               
if(!confirm(self.confirmOverwriteSaveTiddler.format([txtSaveTiddler])))
+               
if(!confirm(me.confirmOverwriteSaveTiddler.format([txtSaveTiddler])))
                        return;
                store.suspendNotifications();
                store.removeTiddler(txtSaveTiddler);
@@ -302,16 +302,16 @@
        var serverType = wizard.getValue("serverType");
        var host = wizard.getValue("host");
        var workspace = wizard.getValue("workspace");
-       var text = self.serverSaveTemplate.format([serverType,host,workspace]);
-       
store.saveTiddler(txtSaveTiddler,txtSaveTiddler,text,self.serverSaveModifier,new
 Date(),["systemServer"]);
+       var text = me.serverSaveTemplate.format([serverType,host,workspace]);
+       
store.saveTiddler(txtSaveTiddler,txtSaveTiddler,text,me.serverSaveModifier,new 
Date(),["systemServer"]);
 };
 
 config.macros.importTiddlers.doImport = function(e)
 {
-       var self = config.macros.importTiddlers;
+       var me = config.macros.importTiddlers;
        var wizard = new Wizard(this);
        if(wizard.getElement("chkSave").checked)
-               self.saveServerTiddler(wizard);
+               me.saveServerTiddler(wizard);
        var chkSync = wizard.getElement("chkSync").checked;
        wizard.setValue("sync",chkSync);
        var listView = wizard.getValue("listView");
@@ -324,10 +324,10 @@
                        overwrite.push(rowNames[t]);
        }
        if(overwrite.length > 0) {
-               if(!confirm(self.confirmOverwriteText.format([overwrite.join(", 
")])))
+               if(!confirm(me.confirmOverwriteText.format([overwrite.join(", 
")])))
                        return false;
        }
-       
wizard.addStep(self.step4Title.format([rowNames.length]),self.step4Html);
+       wizard.addStep(me.step4Title.format([rowNames.length]),me.step4Html);
        for(t=0; t<rowNames.length; t++) {
                var link = document.createElement("div");
                createTiddlyLink(link,rowNames[t],true);
@@ -336,8 +336,8 @@
        }
        wizard.setValue("remainingImports",rowNames.length);
        wizard.setButtons([
-                       {caption: self.cancelLabel, tooltip: self.cancelPrompt, 
onClick: self.onCancel}
-               ],self.statusDoingImport);
+                       {caption: me.cancelLabel, tooltip: me.cancelPrompt, 
onClick: me.onCancel}
+               ],me.statusDoingImport);
        var wizardContext = wizard.getValue("context");
        var tiddlers = wizardContext ? wizardContext.tiddlers : [];
        for(t=0; t<rowNames.length; t++) {
@@ -345,14 +345,14 @@
                        allowSynchronous:true,
                        
tiddler:tiddlers[tiddlers.findByField("title",rowNames[t])]
                };
-               
adaptor.getTiddler(rowNames[t],context,wizard,self.onGetTiddler);
+               adaptor.getTiddler(rowNames[t],context,wizard,me.onGetTiddler);
        }
        return false;
 };
 
 config.macros.importTiddlers.onGetTiddler = function(context,wizard)
 {
-       var self = config.macros.importTiddlers;
+       var me = config.macros.importTiddlers;
        if(!context.status)
                displayMessage("Error in importTiddlers.onGetTiddler: " + 
context.statusText);
        var tiddler = context.tiddler;
@@ -372,8 +372,8 @@
                        refreshDisplay();
                }
                wizard.setButtons([
-                               {caption: self.doneLabel, tooltip: 
self.donePrompt, onClick: self.onClose}
-                       ],self.statusDoneImport);
+                               {caption: me.doneLabel, tooltip: me.donePrompt, 
onClick: me.onClose}
+                       ],me.statusDoneImport);
                autoSaveChanges();
        }
 };

Modified: Trunk/core/js/ListView.js
===================================================================
--- Trunk/core/js/ListView.js   2010-04-22 13:24:17 UTC (rev 12047)
+++ Trunk/core/js/ListView.js   2010-04-22 13:51:27 UTC (rev 12048)
@@ -155,12 +155,13 @@
        createHeader: ListView.columnTypes.String.createHeader,
        createItem: function(place,listObject,field,columnTemplate,col,row)
                {
+                       var msg = config.messages.sizeTemplates;
                        var v = listObject[field];
                        if(v != undefined) {
                                var t = 0;
-                               while(t<config.messages.sizeTemplates.length-1 
&& v<config.messages.sizeTemplates[t].unit)
+                               while(t<msg.length-1 && v<msg[t].unit)
                                        t++;
-                               
createTiddlyText(place,config.messages.sizeTemplates[t].template.format([Math.round(v/config.messages.sizeTemplates[t].unit)]));
+                               
createTiddlyText(place,msg[t].template.format([Math.round(v/msg[t].unit)]));
                        }
                }
 };

Modified: Trunk/core/js/Manager.js
===================================================================
--- Trunk/core/js/Manager.js    2010-04-22 13:24:17 UTC (rev 12047)
+++ Trunk/core/js/Manager.js    2010-04-22 13:51:27 UTC (rev 12048)
@@ -18,6 +18,7 @@
 
 config.macros.plugins.refresh = function(listWrapper,params)
 {
+       var me = config.macros.plugins;
        var wizard = new Wizard(listWrapper);
        var selectedRows = [];
        ListView.forEachSelector(listWrapper,function(e,rowName) {
@@ -52,8 +53,8 @@
                var listView = 
ListView.create(listWrapper,plugins,this.listViewTemplate,this.onSelectCommand);
                wizard.setValue("listView",listView);
                wizard.setButtons([
-                               {caption: config.macros.plugins.removeLabel, 
tooltip: config.macros.plugins.removePrompt, onClick: 
config.macros.plugins.doRemoveTag},
-                               {caption: config.macros.plugins.deleteLabel, 
tooltip: config.macros.plugins.deletePrompt, onClick: 
config.macros.plugins.doDelete}
+                               {caption: me.removeLabel, tooltip: 
me.removePrompt, onClick: me.doRemoveTag},
+                               {caption: me.deleteLabel, tooltip: 
me.deletePrompt, onClick: me.doDelete}
                        ]);
        }
 };

Modified: Trunk/core/js/Options.js
===================================================================
--- Trunk/core/js/Options.js    2010-04-22 13:24:17 UTC (rev 12047)
+++ Trunk/core/js/Options.js    2010-04-22 13:51:27 UTC (rev 12048)
@@ -24,8 +24,9 @@
                        var name = cookies[c].substr(0,p).trim();
                        var value = cookies[c].substr(p+1).trim();
                        var optType = name.substr(0,3);
-                       if(config.optionHandlers[optType] && 
config.optionHandlers[optType].set)
-                               config.optionHandlers[optType].set(name,value);
+                       var handlers = config.optionHandlers;
+                       if(handlers[optType] && handlers[optType].set)
+                               handlers[optType].set(name,value);
                }
        }
 }
@@ -36,8 +37,9 @@
                return;
        var c = name + "=";
        var optType = name.substr(0,3);
-       if(config.optionHandlers[optType] && config.optionHandlers[optType].get)
-               c += config.optionHandlers[optType].get(name);
+       var handlers = config.optionHandlers;
+       if(handlers[optType] && handlers[optType].get)
+               c += handlers[optType].get(name);
        c += "; expires=Fri, 1 Jan 2038 12:00:00 UTC; path=/";
        document.cookie = c;
 }

Modified: Trunk/core/js/Saving.js
===================================================================
--- Trunk/core/js/Saving.js     2010-04-22 13:24:17 UTC (rev 12047)
+++ Trunk/core/js/Saving.js     2010-04-22 13:51:27 UTC (rev 12048)
@@ -100,28 +100,29 @@
                return;
        clearMessage();
        var t0 = new Date();
+       var msg = config.messages;
        //# Get the URL of the document
        var originalPath = document.location.toString();
        //# Check we were loaded from a file URL
        if(originalPath.substr(0,5) != "file:") {
-               alert(config.messages.notFileUrlError);
-               if(store.tiddlerExists(config.messages.saveInstructions))
-                       
story.displayTiddler(null,config.messages.saveInstructions);
+               alert(msg.notFileUrlError);
+               if(store.tiddlerExists(msg.saveInstructions))
+                       story.displayTiddler(null,msg.saveInstructions);
                return;
        }
        var localPath = getLocalPath(originalPath);
        //# Load the original file
        var original = loadOriginal(localPath);
        if(original == null) {
-               alert(config.messages.cantSaveError);
-               if(store.tiddlerExists(config.messages.saveInstructions))
-                       
story.displayTiddler(null,config.messages.saveInstructions);
+               alert(msg.cantSaveError);
+               if(store.tiddlerExists(msg.saveInstructions))
+                       story.displayTiddler(null,msg.saveInstructions);
                return;
        }
        //# Locate the storeArea div's
        var posDiv = locateStoreArea(original);
        if(!posDiv) {
-               alert(config.messages.invalidFileError.format([localPath]));
+               alert(msg.invalidFileError.format([localPath]));
                return;
        }
        saveMain(localPath,original,posDiv);

Modified: Trunk/core/js/Search.js
===================================================================
--- Trunk/core/js/Search.js     2010-04-22 13:24:17 UTC (rev 12047)
+++ Trunk/core/js/Search.js     2010-04-22 13:51:27 UTC (rev 12048)
@@ -43,11 +43,12 @@
 
 config.macros.search.onKeyPress = function(ev)
 {
+       var me = config.macros.search;
        var e = ev || window.event;
        switch(e.keyCode) {
                case 13: // Ctrl-Enter
                case 10: // Ctrl-Enter on IE PC
-                       config.macros.search.doSearch(this);
+                       me.doSearch(this);
                        break;
                case 27: // Escape
                        this.value = "";
@@ -57,14 +58,14 @@
        if(config.options.chkIncrementalSearch) {
                if(this.value.length > 2) {
                        if(this.value != this.getAttribute("lastSearchText")) {
-                               if(config.macros.search.timeout)
-                                       
clearTimeout(config.macros.search.timeout);
+                               if(me.timeout)
+                                       clearTimeout(me.timeout);
                                var txt = this;
-                               config.macros.search.timeout = 
setTimeout(function() {config.macros.search.doSearch(txt);},500);
+                               me.timeout = setTimeout(function() 
{me.doSearch(txt);},500);
                        }
                } else {
-                       if(config.macros.search.timeout)
-                               clearTimeout(config.macros.search.timeout);
+                       if(me.timeout)
+                               clearTimeout(me.timeout);
                }
        }
 };

Modified: Trunk/core/js/Sync.js
===================================================================
--- Trunk/core/js/Sync.js       2010-04-22 13:24:17 UTC (rev 12047)
+++ Trunk/core/js/Sync.js       2010-04-22 13:51:27 UTC (rev 12048)
@@ -126,6 +126,7 @@
        };
 
        var getTiddlerListCallback = function(context,sycnItems) {
+               var me = config.macros.sync;
                if(!context.status) {
                        displayMessage(context.statusText);
                        return false;
@@ -137,12 +138,12 @@
                        var f = tiddlers.findByField("title",si.title);
                        if(f !== null) {
                                if(tiddlers[f].fields['server.page.revision'] > 
si.tiddler.fields['server.page.revision']) {
-                                       si.syncStatus = 
config.macros.sync.syncStatusList[si.isTouched ? 'changedBoth' : 
'changedServer'];
+                                       si.syncStatus = 
me.syncStatusList[si.isTouched ? 'changedBoth' : 'changedServer'];
                                }
                        } else {
-                               si.syncStatus = 
config.macros.sync.syncStatusList.notFound;
+                               si.syncStatus = me.syncStatusList.notFound;
                        }
-                       config.macros.sync.updateSyncStatus(si);
+                       me.updateSyncStatus(si);
                }
                return true;
        };
@@ -165,24 +166,25 @@
 
 config.macros.sync.doSync = function(e)
 {
+       var me = config.macros.sync;
        var getTiddlerCallback = function(context,syncItem) {
                if(syncItem) {
                        var tiddler = context.tiddler;
                        
store.saveTiddler(tiddler.title,tiddler.title,tiddler.text,tiddler.modifier,tiddler.modified,tiddler.tags,tiddler.fields,true,tiddler.created);
-                       syncItem.syncStatus = 
config.macros.sync.syncStatusList.gotFromServer;
-                       config.macros.sync.updateSyncStatus(syncItem);
+                       syncItem.syncStatus = me.syncStatusList.gotFromServer;
+                       me.updateSyncStatus(syncItem);
                }
        };
        var putTiddlerCallback = function(context,syncItem) {
                if(syncItem) {
                        store.resetTiddler(context.title);
-                       syncItem.syncStatus = 
config.macros.sync.syncStatusList.putToServer;
-                       config.macros.sync.updateSyncStatus(syncItem);
+                       syncItem.syncStatus = me.syncStatusList.putToServer;
+                       me.updateSyncStatus(syncItem);
                }
        };
 
        var rowNames = ListView.getSelectedRows(currSync.listView);
-       var sl = config.macros.sync.syncStatusList;
+       var sl = me.syncStatusList;
        for(var i=0; i<currSync.syncList.length; i++) {
                var si = currSync.syncList[i];
                if(rowNames.indexOf(si.title) != -1) {

-- 
You received this message because you are subscribed to the Google Groups 
"TiddlyWikiDev" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/tiddlywikidev?hl=en.

Reply via email to