Changeset 261

Timestamp:

07/16/05 23:36:48 (8 years ago)

Author:

gogo

Message:

Fix for #167 - 8bit characters causing problems in links. You may turn
off this fix with config.only7BitPrintablesInURLs = false;

Files:

• trunk/htmlarea.js (modified) (6 diffs)

trunk/htmlarea.js

@@ -245 +245 @@
   //  that don't have a url prefixing them
   this.stripSelfNamedAnchors = true;
+
+  // sometimes high-ascii in links can cause problems for servers (basically they don't recognise them)
+  //  so you can use this flag to ensure that all characters other than the normal ascii set (actually
+  //  only ! through ~) are escaped in URLs to % codes
+  this.only7BitPrintablesInURLs = true;
 
   // sometimes we want to be able to replace some string in the html comng in and going out
@@ -1948 +1953 @@
     {
       var html = this.outwardHtml(this.getHTML());
-      this._textArea.value = html;
+      this.setHTML(html);
 
       // Hide the iframe
@@ -1969 +1974 @@
       var html = this.inwardHtml(this.getHTML());
       this.deactivateEditor();
-      if (!this.config.fullPage)
-      {
-        this._doc.body.innerHTML = html;
-      }
-      else
-      {
-        this.setFullHTML(html);
-      }
+      this.setHTML(html);
       this._iframe.style.display   = '';
       this._textArea.style.display = "none";
@@ -4238 +4236 @@
 // completely change the HTML inside
 HTMLArea.prototype.setHTML = function(html) {
-  switch (this._editMode)
-  {
-    case "wysiwyg"  :
-    {
-      if (!this.config.fullPage)
-      {
-        this._doc.body.innerHTML = html;
-      }
-      else
-      {
-        this.setFullHTML(html);
-      }
-    }
-    break;
-
-    case "textmode" :
-    {
-      this._textArea.value = html;
-    }
-    break;
-
-    default             :
-    {
-      alert("Mode <" + mode + "> not defined!");
-    }
-    break;
-  }
-  return false;
+  if (!this.config.fullPage)
+  {
+    this._doc.body.innerHTML = html;
+  }
+  else
+  {
+    this.setFullHTML(html);
+  }
+  this._textArea.value = html;
 };
 
@@ -4712 +4691 @@
               value = editor.stripBaseURL(value);
             }
+
+            // High-ascii (8bit) characters in links seem to cause problems for some sites,
+            // while this seems to be consistent with RFC 3986 Section 2.4
+            // because these are not "reserved" characters, it does seem to
+            // cause links to international resources not to work.  See ticket:167
+
+            // IE always returns high-ascii characters un-encoded in links even if they
+            // were supplied as % codes (it unescapes them when we pul the value from the link).
+
+            // Hmmm, very strange if we use encodeURI here, or encodeURIComponent in place
+            // of escape below, then the encoding is wrong.  I mean, completely.
+            // Nothing like it should be at all.  Using escape seems to work though.
+            // It's in both browsers too, so either I'm doing something wrong, or
+            // something else is going on?
+
+            if(editor.config.only7BitPrintablesInURLs)
+            {
+              value = value.replace(/([^!-~]+)/g, function(match) { return escape(match); });
+            }
           }
         } else { // IE fails to put style in attributes list
@@ -4755 +4753 @@
   return html;
 };
+
+/** @see getHTMLWrapper (search for "value = a.nodeValue;") */
 
 HTMLArea.prototype.stripBaseURL = function(string)