Changeset 756

Timestamp:

02/21/07 16:46:07 (5 years ago)

Author:

htanaka

Message:

#958 Xinha._resolveRelativeUrl has been moved to before first using.

Files:

• trunk/XinhaCore.js (modified) (2 diffs)

trunk/XinhaCore.js

@@ -41 +41 @@
   'RevisionBy': '$LastChangedBy$'.replace(/^[^:]*: (.*) \$$/, '$1')
 };
+
+//must be here. it is called while converting _editor_url to absolute
+Xinha._resolveRelativeUrl = function( base, url )
+{
+  if(url.match(/^([^:]+\:)?\//))
+  {
+    return url;
+  }
+  else
+  {
+    var b = base.split("/");
+    if(b[b.length - 1] == "")
+    {
+      b.pop();
+    }
+    var p = url.split("/");
+    if(p[0] == ".")
+    {
+      p.shift();
+    }
+    while(p[0] == "..")
+    {
+      b.pop();
+      p.shift();
+    }
+    return b.join("/") + "/" + p.join("/");
+  }
+}
 
 if ( typeof _editor_url == "string" )
@@ -4172 +4200 @@
 };
 
-Xinha._resolveRelativeUrl = function( base, url )
-{
-  if(url.match(/^([^:]+\:)?\//))
-  {
-    return url;
-  }
-  else
-  {
-    var b = base.split("/");
-    if(b[b.length - 1] == "")
-    {
-      b.pop();
-    }
-    var p = url.split("/");
-    if(p[0] == ".")
-    {
-      p.shift();
-    }
-    while(p[0] == "..")
-    {
-      b.pop();
-      p.shift();
-    }
-    return b.join("/") + "/" + p.join("/");
-  }
-}
-
 Xinha.prototype.fixRelativeLinks = function(html)
 {