Changeset 734

Timestamp:

02/13/07 16:43:06 (6 years ago)

Author:

htanaka

Message:

fix #950 all terms in ContextMenu will be translated even if baseHref is specified.
* _editor_url might be converted as absolute if it is relative.
* _resolveRelativeUrl function was moved from insert_image.html to Xinha core class.

Location:

trunk

Files:

• XinhaCore.js (modified) (1 diff)
• modules/InsertImage/insert_image.html (modified) (3 diffs)

trunk/XinhaCore.js

@@ -42 +42 @@
 };
 
+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" )
 {
   // Leave exactly one backslash at the end of _editor_url
   _editor_url = _editor_url.replace(/\x2f*$/, '/');
+  
+  // convert _editor_url to absolute
+  if(!_editor_url.match(/^([^:]+\:)?\//)){
+    var path = window.location.toString().split("/");
+    path.pop();
+    _editor_url = Xinha._resolveRelativeUrl(path.join("/"), _editor_url);
+  }
 }
 else

trunk/modules/InsertImage/insert_image.html

@@ -14 +14 @@
 function i18n(str) {
   return (Xinha._lc(str, 'Xinha'));
-}
-
-function resolveRelativeUrl(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("/");
-        }
 }
 
@@ -54 +33 @@
   document.getElementById("f_horiz").value  = (typeof param["f_horiz"]!="undefined") ? param["f_horiz"] : "";
   if (param["f_url"]) {
-      window.ipreview.location.replace(resolveRelativeUrl(param.f_base, param.f_url));
+      window.ipreview.location.replace(Xinha._resolveRelativeUrl(param.f_base, param.f_url));
   }
   document.getElementById("f_url").focus();
@@ -98 +77 @@
     return false;
   }
-  window.ipreview.location.replace(resolveRelativeUrl(base, url));
+  window.ipreview.location.replace(Xinha._resolveRelativeUrl(base, url));
   return false;
 }