Changeset 2790

Show
Ignore:
Timestamp:
11/16/07 05:48:22 (1 year ago)
Author:
jun66j5
Message:

fixed #2187 - a problem that is non wiki names are transformed to wiki names.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • tracwysiwygplugin/0.10/tests/testcase.js

    r2777 r2790  
    246246                    href: "./search?q=changeset%3A345%2Ftrunk", title: "changeset:345/trunk", 
    247247                    "tracwysiwyg-link": "changeset:345/trunk", onclick: "return false;" }), 
    248                 ", [123], r234, [345/trunk]"); 
    249             generateFragment.call(this, dom, "[123], r234, [345/trunk], ![123], !r234, ![345/trunk]"); 
    250             generate.call(this, dom, "[123], [changeset:234 r234], [345/trunk], ![123], !r234, ![345/trunk]"); 
     248                ", [123], r234, [345/trunk], ar123"); 
     249            generateFragment.call(this, dom, "[123], r234, [345/trunk], ![123], !r234, ![345/trunk], ar123"); 
     250            generate.call(this, dom, "[123], [changeset:234 r234], [345/trunk], ![123], !r234, ![345/trunk], ar123"); 
    251251        }); 
    252252 
     
    458458                    onclick: "return false;" }), 
    459459                " CamelCase FooBarA FOo FoobarA Oneà
    460 ngström OneÃ¥ngström"); 
     460ngström OneÃ¥ngström setTextColor"); 
    461461            generateFragment.call(this, dom, 
    462462                "CamelCase !CamelCase FooBarA FOo FoobarA Oneà
    463 ngström OneÃ¥ngström"); 
     463ngström OneÃ¥ngström setTextColor"); 
    464464            generate.call(this, dom, 
    465465                "[wiki:CamelCase] !CamelCase FooBarA FOo FoobarA Oneà
    466 ngström OneÃ¥ngström"); 
     466ngström OneÃ¥ngström setTextColor"); 
    467467        }); 
    468468 
  • tracwysiwygplugin/0.10/tracwysiwyg/htdocs/wysiwyg.js

    r2777 r2790  
    903903    wikiInlineRules.push("!?\\[\\[[\\w/+-]+(?:\\]\\]|\\(.*?\\)\\]\\])"); 
    904904                                            // 17. WikiPageName 
    905     wikiInlineRules.push("!?" + _wikiPageName); 
     905    wikiInlineRules.push("(?:\\b|!)" + _wikiPageName); 
    906906                                            // 18. ["internal free link"] 
    907907    wikiInlineRules.push("!?\\[(?:" + _quotedString + ")\\]"); 
     
    17511751    var wikiInlineRulesPattern = this.wikiInlineRulesPattern; 
    17521752    var tracLinkPattern = new RegExp("^" + this._tracLink + "$"); 
    1753     var wikiPageNamePattern = new RegExp("^" + this._wikiPageName + "$"); 
    17541753    var decorationTokenPattern = /^(?:'''|''|__|\^|,,)$/; 
    17551754 
  • tracwysiwygplugin/0.11/tests/testcase.js

    r2777 r2790  
    246246                    href: "./search?q=changeset%3A345%2Ftrunk", title: "changeset:345/trunk", 
    247247                    "tracwysiwyg-link": "changeset:345/trunk", onclick: "return false;" }), 
    248                 ", [123], r234, [345/trunk]"); 
    249             generateFragment.call(this, dom, "[123], r234, [345/trunk], ![123], !r234, ![345/trunk]"); 
    250             generate.call(this, dom, "[123], [changeset:234 r234], [345/trunk], ![123], !r234, ![345/trunk]"); 
     248                ", [123], r234, [345/trunk], ar123"); 
     249            generateFragment.call(this, dom, "[123], r234, [345/trunk], ![123], !r234, ![345/trunk], ar123"); 
     250            generate.call(this, dom, "[123], [changeset:234 r234], [345/trunk], ![123], !r234, ![345/trunk], ar123"); 
    251251        }); 
    252252 
     
    458458                    onclick: "return false;" }), 
    459459                " CamelCase FooBarA FOo FoobarA Oneà
    460 ngström OneÃ¥ngström"); 
     460ngström OneÃ¥ngström setTextColor"); 
    461461            generateFragment.call(this, dom, 
    462462                "CamelCase !CamelCase FooBarA FOo FoobarA Oneà
    463 ngström OneÃ¥ngström"); 
     463ngström OneÃ¥ngström setTextColor"); 
    464464            generate.call(this, dom, 
    465465                "[wiki:CamelCase] !CamelCase FooBarA FOo FoobarA Oneà
    466 ngström OneÃ¥ngström"); 
     466ngström OneÃ¥ngström setTextColor"); 
    467467        }); 
    468468 
  • tracwysiwygplugin/0.11/tracwysiwyg/htdocs/wysiwyg.js

    r2777 r2790  
    903903    wikiInlineRules.push("!?\\[\\[[\\w/+-]+(?:\\]\\]|\\(.*?\\)\\]\\])"); 
    904904                                            // 17. WikiPageName 
    905     wikiInlineRules.push("!?" + _wikiPageName); 
     905    wikiInlineRules.push("(?:\\b|!)" + _wikiPageName); 
    906906                                            // 18. ["internal free link"] 
    907907    wikiInlineRules.push("!?\\[(?:" + _quotedString + ")\\]"); 
     
    17511751    var wikiInlineRulesPattern = this.wikiInlineRulesPattern; 
    17521752    var tracLinkPattern = new RegExp("^" + this._tracLink + "$"); 
    1753     var wikiPageNamePattern = new RegExp("^" + this._wikiPageName + "$"); 
    17541753    var decorationTokenPattern = /^(?:'''|''|__|\^|,,)$/; 
    17551754