Changeset 2814
- Timestamp:
- 12/11/07 16:18:49 (10 months ago)
- Files:
-
- Trunk/core/js/Paramifiers.js (modified) (2 diffs)
- Trunk/core/js/Story.js (modified) (5 diffs)
- Trunk/core/js/Utilities.js (modified) (2 diffs)
- Trunk/core/js/main.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
Trunk/core/js/Paramifiers.js
r2120 r2814 61 61 onstart: function(v) { 62 62 var tagged = store.getTaggedTiddlers(v,"title"); 63 for(var t=0; t<tagged.length; t++) 64 story.displayTiddler("bottom",tagged[t].title,null,false,null); 63 story.displayTiddlers(null,tagged,null,false,null); 65 64 } 66 65 }; … … 93 92 }; 94 93 94 Trunk/core/js/Story.js
r2774 r2814 32 32 33 33 //# Display several tiddlers given their titles in an array. Parameters same as displayTiddler(), except: 34 //# titles - array of string titles34 //# titles - array of tiddlers or string titles 35 35 Story.prototype.displayTiddlers = function(srcElement,titles,template,animate,unused,customFields,toggle) 36 36 { … … 44 44 //# srcElement - reference to element from which this one is being opened -or- 45 45 //# special positions "top", "bottom" 46 //# ti tle -title of tiddler to display46 //# tiddler - tiddler or title of tiddler to display 47 47 //# template - the name of the tiddler containing the template -or- 48 48 //# one of the constants DEFAULT_VIEW_TEMPLATE and DEFAULT_EDIT_TEMPLATE -or- … … 51 51 //# customFields - an optional list of name:"value" pairs to be assigned as tiddler fields (for edit templates) 52 52 //# toggle - if true, causes the tiddler to be closed if it is already opened 53 Story.prototype.displayTiddler = function(srcElement,title,template,animate,unused,customFields,toggle) 54 { 53 Story.prototype.displayTiddler = function(srcElement,tiddler,template,animate,unused,customFields,toggle) 54 { 55 var title = (tiddler instanceof Tiddler)? tiddler.title : tiddler; 55 56 var place = document.getElementById(this.container); 56 57 var tiddlerElem = document.getElementById(this.idPrefix + title); … … 492 493 highlightHack = new RegExp(useRegExp ? text : text.escapeRegExp(),useCaseSensitive ? "mg" : "img"); 493 494 var matches = store.search(highlightHack,"title","excludeSearch"); 494 var titles = []; 495 for(var t=0;t<matches.length;t++) 496 titles.push(matches[t].title); 497 this.displayTiddlers(null,titles); 495 this.displayTiddlers(null,matches); 498 496 highlightHack = null; 499 497 var q = useRegExp ? "/" : "'"; 500 498 if(matches.length > 0) 501 displayMessage(config.macros.search.successMsg.format([ titles.length.toString(),q + text + q]));499 displayMessage(config.macros.search.successMsg.format([matches.length.toString(),q + text + q])); 502 500 else 503 501 displayMessage(config.macros.search.failureMsg.format([q + text + q])); … … 601 599 }; 602 600 601 Trunk/core/js/Utilities.js
r2806 r2814 184 184 var tag = this.getAttribute("tag"); 185 185 var tagged = store.getTaggedTiddlers(tag); 186 var titles = []; 187 for(var t=0; t<tagged.length; t++) 188 titles.push(tagged[t].title); 189 story.displayTiddlers(this,titles); 186 story.displayTiddlers(this,tagged); 190 187 return false; 191 188 } … … 291 288 } 292 289 290 Trunk/core/js/main.js
r2809 r2814 86 86 if(story.isEmpty()) { 87 87 var tiddlers = store.filterTiddlers(store.getTiddlerText("DefaultTiddlers")); 88 for(var t=0; t<tiddlers.length; t++) { 89 story.displayTiddler("bottom",tiddlers[t].title); 90 } 88 story.displayTiddlers(null,tiddlers); 91 89 } 92 90 window.scrollTo(0,0);