TiddlyWiki.org

Changeset 1552

Show
Ignore:
Timestamp:
13/02/07 18:32:26 (2 years ago)
Author:
JeremyRuston
Message:

Fixed problem with chkToggleLinks and the "jump" command (ticket #156)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • Trunk/core/js/Commands.js

    r1549 r1552  
    9191        if(popup) { 
    9292                story.forEachTiddler(function(title,element) { 
    93                         createTiddlyLink(createTiddlyElement(popup,"li"),title,true); 
     93                        createTiddlyLink(createTiddlyElement(popup,"li"),title,true,null,false,null,true); 
    9494                        }); 
    9595        } 
  • Trunk/core/js/Utilities.js

    r1551 r1552  
    3232//#   includeText - flag for whether to include the title as the text of the link 
    3333//#   theClass - custom CSS class for the link 
    34 //#   linkedFromTiddler - tiddler from which to inherit extended fields   
    35 function createTiddlyLink(place,title,includeText,theClass,isStatic,linkedFromTiddler) 
     34//#   linkedFromTiddler - tiddler from which to inherit extended fields 
     35//#   noToggle - flag to force the link to open the target, even if chkToggleLinks is on 
     36function createTiddlyLink(place,title,includeText,theClass,isStatic,linkedFromTiddler,noToggle) 
    3637{ 
    3738        var text = includeText ? title : null; 
     
    4041        btn.setAttribute("refresh","link"); 
    4142        btn.setAttribute("tiddlyLink",title); 
     43        if(noToggle) 
     44                btn.setAttribute("noToggle","true"); 
    4245        if(linkedFromTiddler) { 
    4346                var fields = linkedFromTiddler.getInheritedFields(); 
     
    99102        var title = null; 
    100103        var fields = null; 
     104        var noToggle = null; 
    101105        do { 
    102106                title = theLink.getAttribute("tiddlyLink"); 
    103107                fields = theLink.getAttribute("tiddlyFields"); 
     108                noToggle = theLink.getAttribute("noToggle"); 
    104109                theLink = theLink.parentNode; 
    105110        } while(title == null && theLink != null); 
     
    110115                if(config.options.chkToggleLinks) 
    111116                        toggling = !toggling; 
     117                if(noToggle) 
     118                        toggling = false; 
    112119                story.displayTiddler(theTarget,title,null,true,e.shiftKey || e.altKey,fields,toggling); 
    113120        }