TiddlyWiki.org

Changeset 4943

Show
Ignore:
Timestamp:
14/05/08 15:47:26 (4 months ago)
Author:
MartinBudden
Message:

Minor improvements

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • Trunk/contributors/MartinBudden/adaptors/ImportWorkspacePlugin.js

    r4752 r4943  
    44|''Author:''|Martin Budden (mjbudden (at) gmail (dot) com)| 
    55|''CodeRepository:''|http://svn.tiddlywiki.org/Trunk/contributors/MartinBudden/adaptors/ImportWorkspacePlugin.js | 
    6 |''Version:''|0.0.5
     6|''Version:''|0.0.6
    77|''Date:''|Aug 23, 2007| 
    88|''Comments:''|Please make comments at http://groups.google.co.uk/group/TiddlyWikiDev | 
     
    9696//#displayMessage("cf:"+customFields) 
    9797        var fields = customFields ? customFields.decodeHashMap() : config.defaultCustomFields; 
    98         config.macros.importWorkspace.getTiddlers(fields); 
     98        config.macros.importWorkspace.getTiddlers(this.createContext(fields)); 
    9999}; 
    100100 
     
    114114        fields['server.workspace'] = store.getTiddlerSlice(feed,'Workspace'); 
    115115        var filter = store.getTiddlerSlice(feed,'TiddlerFilter'); 
    116         config.macros.importWorkspace.getTiddlers(fields,filter); 
     116        config.macros.importWorkspace.getTiddlers(this.createContext(fields,filter)); 
    117117}; 
    118118 
    119 config.macros.importWorkspace.getTiddlers = function(fields,filter) 
     119config.macros.importWorkspace.createContext = function(fields,filter) 
    120120{ 
    121         /*if(!fields['server.type']) { 
    122                 var tiddlers = store.getTaggedTiddlers('systemServer'); 
    123                 var title = tiddlers[0].title; 
    124                 fields = {}; 
    125                 fields['server.type'] = store.getTiddlerSlice(title,'Type'); 
    126                 fields['server.host'] = store.getTiddlerSlice(title,'URL'); 
    127                 fields['server.workspace'] = store.getTiddlerSlice(title,'Workspace'); 
    128                 context.filter = store.getTiddlerSlice(title,'TiddlerFilter'); 
    129         }*/ 
    130121        var serverType = fields['server.type']; 
    131122        if(!serverType) 
     
    142133                context.filter = filter; 
    143134                context.adaptor = adaptor; 
    144                 adaptor.openHost(context.host,context,null,config.macros.importWorkspace.openHostCallback)
     135                return context
    145136        } 
    146         return true; 
     137        return false; 
     138}; 
     139 
     140config.macros.importWorkspace.getTiddlers = function(context) 
     141
     142        if(context) { 
     143                context.adaptor.openHost(context.host,context,null,config.macros.importWorkspace.openHostCallback); 
     144                return true; 
     145        } 
     146        return false; 
    147147}; 
    148148