Changeset 2790
- Timestamp:
- 11/16/07 05:48:22 (1 year ago)
- Files:
-
- tracwysiwygplugin/0.10/tests/testcase.js (modified) (2 diffs)
- tracwysiwygplugin/0.10/tracwysiwyg/htdocs/wysiwyg.js (modified) (2 diffs)
- tracwysiwygplugin/0.11/tests/testcase.js (modified) (2 diffs)
- tracwysiwygplugin/0.11/tracwysiwyg/htdocs/wysiwyg.js (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
tracwysiwygplugin/0.10/tests/testcase.js
r2777 r2790 246 246 href: "./search?q=changeset%3A345%2Ftrunk", title: "changeset:345/trunk", 247 247 "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"); 251 251 }); 252 252 … … 458 458 onclick: "return false;" }), 459 459 " CamelCase FooBarA FOo FoobarA Oneà 460 ngström OneÃ¥ngström ");460 ngström OneÃ¥ngström setTextColor"); 461 461 generateFragment.call(this, dom, 462 462 "CamelCase !CamelCase FooBarA FOo FoobarA Oneà 463 ngström OneÃ¥ngström ");463 ngström OneÃ¥ngström setTextColor"); 464 464 generate.call(this, dom, 465 465 "[wiki:CamelCase] !CamelCase FooBarA FOo FoobarA Oneà 466 ngström OneÃ¥ngström ");466 ngström OneÃ¥ngström setTextColor"); 467 467 }); 468 468 tracwysiwygplugin/0.10/tracwysiwyg/htdocs/wysiwyg.js
r2777 r2790 903 903 wikiInlineRules.push("!?\\[\\[[\\w/+-]+(?:\\]\\]|\\(.*?\\)\\]\\])"); 904 904 // 17. WikiPageName 905 wikiInlineRules.push(" !?" + _wikiPageName);905 wikiInlineRules.push("(?:\\b|!)" + _wikiPageName); 906 906 // 18. ["internal free link"] 907 907 wikiInlineRules.push("!?\\[(?:" + _quotedString + ")\\]"); … … 1751 1751 var wikiInlineRulesPattern = this.wikiInlineRulesPattern; 1752 1752 var tracLinkPattern = new RegExp("^" + this._tracLink + "$"); 1753 var wikiPageNamePattern = new RegExp("^" + this._wikiPageName + "$");1754 1753 var decorationTokenPattern = /^(?:'''|''|__|\^|,,)$/; 1755 1754 tracwysiwygplugin/0.11/tests/testcase.js
r2777 r2790 246 246 href: "./search?q=changeset%3A345%2Ftrunk", title: "changeset:345/trunk", 247 247 "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"); 251 251 }); 252 252 … … 458 458 onclick: "return false;" }), 459 459 " CamelCase FooBarA FOo FoobarA Oneà 460 ngström OneÃ¥ngström ");460 ngström OneÃ¥ngström setTextColor"); 461 461 generateFragment.call(this, dom, 462 462 "CamelCase !CamelCase FooBarA FOo FoobarA Oneà 463 ngström OneÃ¥ngström ");463 ngström OneÃ¥ngström setTextColor"); 464 464 generate.call(this, dom, 465 465 "[wiki:CamelCase] !CamelCase FooBarA FOo FoobarA Oneà 466 ngström OneÃ¥ngström ");466 ngström OneÃ¥ngström setTextColor"); 467 467 }); 468 468 tracwysiwygplugin/0.11/tracwysiwyg/htdocs/wysiwyg.js
r2777 r2790 903 903 wikiInlineRules.push("!?\\[\\[[\\w/+-]+(?:\\]\\]|\\(.*?\\)\\]\\])"); 904 904 // 17. WikiPageName 905 wikiInlineRules.push(" !?" + _wikiPageName);905 wikiInlineRules.push("(?:\\b|!)" + _wikiPageName); 906 906 // 18. ["internal free link"] 907 907 wikiInlineRules.push("!?\\[(?:" + _quotedString + ")\\]"); … … 1751 1751 var wikiInlineRulesPattern = this.wikiInlineRulesPattern; 1752 1752 var tracLinkPattern = new RegExp("^" + this._tracLink + "$"); 1753 var wikiPageNamePattern = new RegExp("^" + this._wikiPageName + "$");1754 1753 var decorationTokenPattern = /^(?:'''|''|__|\^|,,)$/; 1755 1754
