Changeset 2849

Timestamp:

12/04/07 09:39:54 (1 year ago)

Author:

jun66j5

Message:

refs #2142

• Fixed a problem that the autolinks generation convert from CamelCase to [CamelCase CamelCase].
  
• Fixed a problem that text like CamelCase get [wiki:CamelCase] instead of CamelCase.
  
• Fixed some bugs.
  

Files:

• tracwysiwygplugin/0.10/tests/testcase.js (modified) (1 diff)
• tracwysiwygplugin/0.10/tracwysiwyg/htdocs/wysiwyg.js (modified) (9 diffs)
• tracwysiwygplugin/0.11/tests/testcase.js (modified) (1 diff)
• tracwysiwygplugin/0.11/tracwysiwyg/htdocs/wysiwyg.js (modified) (9 diffs)

tracwysiwygplugin/0.10/tests/testcase.js

@@ -558 +558 @@
-
-        unit.add("WikiPageName", function() {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                "CamelCase !CamelCase FooBarA FOo FoobarA OneÃ
-
-
-
-
+
+
+
-        });
-

tracwysiwygplugin/0.10/tracwysiwyg/htdocs/wysiwyg.js

@@ -473 +473 @@
-
-    function listenerKeypress(event) {
-        if (!self.autolink) {
-            return;
-        }
-        event = event || self.contentWindow.event;
-        switch (event.charCode || event.keyCode) {
@@ -608 +605 @@
-
-TracWysiwyg.prototype.detectTracLink = function(event) {
+    if (!this.autolink) {
+        return;
+    }
-    var range = this.getSelectionRange();
-    var node = range.startContainer;
@@ -640 +640 @@
-    var text = [ node.nodeValue.substring(0, offset) ];
-    for ( ; ; ) {
+        if (/[ \t\r\n\f\v]/.test(text[text.length - 1])) {
+            break;
+        }
-        node = node.previousSibling;
-        if (!node || node.nodeType == 1) {
@@ -654 +657 @@
-
-    var pattern = this.wikiDetectTracLinkPattern;
-0
+/[^ \t\r\n\f\v]*$/.exec(text).index
-    var match, tmp;
-    for (tmp = pattern.exec(text); tmp; tmp = pattern.exec(text)) {
@@ -663 +666 @@
-    }
-
-match.length - 1
-convertWikiSyntax
+0
+normalizeTracLink
-    var id = this.generateDomId();
-    var anchor = this.createAnchor(link, label, { id: id, "tracwysiwyg-autolink": true });
@@ -1991 +1994 @@
-    var wikiSyntaxPattern = this.wikiSyntaxPattern;
-    var tracLinkPattern = new RegExp("^" + this._tracLink + "$");
+    var wikiPageNamePattern = new RegExp("^" + this._wikiPageName + "$");
-    var decorationTokenPattern = /^(?:'''|''|__|\^|,,)$/;
-
@@ -2181 +2185 @@
-        }
-        var text = null;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        if (!text) {
@@ -2191 +2209 @@
-            if (match) {
-                if (label == match[2]) {
-
+
+
+
+
+
+
+
-                }
-                else {
@@ -2221 +2245 @@
-            text = tracLinkText(link, label);
-        }
-
+
+
+
+
-    }
-

tracwysiwygplugin/0.11/tests/testcase.js

@@ -558 +558 @@
-
-        unit.add("WikiPageName", function() {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                "CamelCase !CamelCase FooBarA FOo FoobarA OneÃ
-
-
-
-
+
+
+
-        });
-

tracwysiwygplugin/0.11/tracwysiwyg/htdocs/wysiwyg.js

@@ -473 +473 @@
-
-    function listenerKeypress(event) {
-        if (!self.autolink) {
-            return;
-        }
-        event = event || self.contentWindow.event;
-        switch (event.charCode || event.keyCode) {
@@ -608 +605 @@
-
-TracWysiwyg.prototype.detectTracLink = function(event) {
+    if (!this.autolink) {
+        return;
+    }
-    var range = this.getSelectionRange();
-    var node = range.startContainer;
@@ -640 +640 @@
-    var text = [ node.nodeValue.substring(0, offset) ];
-    for ( ; ; ) {
+        if (/[ \t\r\n\f\v]/.test(text[text.length - 1])) {
+            break;
+        }
-        node = node.previousSibling;
-        if (!node || node.nodeType == 1) {
@@ -654 +657 @@
-
-    var pattern = this.wikiDetectTracLinkPattern;
-0
+/[^ \t\r\n\f\v]*$/.exec(text).index
-    var match, tmp;
-    for (tmp = pattern.exec(text); tmp; tmp = pattern.exec(text)) {
@@ -663 +666 @@
-    }
-
-match.length - 1
-convertWikiSyntax
+0
+normalizeTracLink
-    var id = this.generateDomId();
-    var anchor = this.createAnchor(link, label, { id: id, "tracwysiwyg-autolink": true });
@@ -1991 +1994 @@
-    var wikiSyntaxPattern = this.wikiSyntaxPattern;
-    var tracLinkPattern = new RegExp("^" + this._tracLink + "$");
+    var wikiPageNamePattern = new RegExp("^" + this._wikiPageName + "$");
-    var decorationTokenPattern = /^(?:'''|''|__|\^|,,)$/;
-
@@ -2181 +2185 @@
-        }
-        var text = null;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        if (!text) {
@@ -2191 +2209 @@
-            if (match) {
-                if (label == match[2]) {
-
+
+
+
+
+
+
+
-                }
-                else {
@@ -2221 +2245 @@
-            text = tracLinkText(link, label);
-        }
-
+
+
+
+
-    }
-