Changeset 733

Timestamp:

02/13/07 12:54:39 (6 years ago)

Author:

htanaka

Message:

fix #949 InsertImage? dialog can preview stripped url image.

Location:

trunk/modules/InsertImage

Files:

• insert_image.html (modified) (5 diffs)
• insert_image.js (modified) (7 diffs)

trunk/modules/InsertImage/insert_image.html

@@ -16 +16 @@
 }
 
+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("/");
+        }
+}
+
 function Init() {
   __dlg_translate('Xinha');
@@ -23 +44 @@
   document.getElementById("f_align").selectedIndex = 5;
   var param = window.dialogArguments;
-  if (param) {
-      document.getElementById("f_url").value = param["f_url"];
-      document.getElementById("f_alt").value = param["f_alt"];
-      document.getElementById("f_border").value = param["f_border"];
-      document.getElementById("f_align").value = param["f_align"];
-      document.getElementById("f_vert").value = param["f_vert"];
-      document.getElementById("f_horiz").value = param["f_horiz"];
-      window.ipreview.location.replace(param.f_url);
+  if (param["f_base"]) {
+      document.getElementById("f_base").value = param["f_base"];
+  }
+  document.getElementById("f_url").value    = param["f_url"] ? param["f_url"] : "";
+  document.getElementById("f_alt").value    = param["f_alt"] ? param["f_alt"] : "";
+  document.getElementById("f_border").value = (typeof param["f_border"]!="undefined") ? param["f_border"] : "";
+  document.getElementById("f_align").value  = param["f_align"] ? param["f_align"] : "";
+  document.getElementById("f_vert").value   = (typeof param["f_vert"]!="undefined") ? param["f_vert"] : "";
+  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));
   }
   document.getElementById("f_url").focus();
@@ -68 +92 @@
   var f_url = document.getElementById("f_url");
   var url = f_url.value;
+  var base = document.getElementById("f_base").value;
   if (!url) {
     alert(i18n("You must enter the URL"));
@@ -73 +98 @@
     return false;
   }
-  window.ipreview.location.replace(url);
+  window.ipreview.location.replace(resolveRelativeUrl(base, url));
   return false;
 }
@@ -85 +110 @@
 <!--- new stuff --->
 <form action="" method="get">
+<input type="hidden" name="base" id="f_base"/>
 <table border="0" width="100%" style="padding: 0px; margin: 0px">
   <tbody>

trunk/modules/InsertImage/insert_image.js

@@ -41 +41 @@
 {
   var editor = this;    // for nested functions
-  var outparam = null;
+  var outparam;
   if ( typeof image == "undefined" )
   {
@@ -50 +50 @@
     }
   }
+  
+  var base;
+  if ( typeof editor.config.baseHref != 'undefined' && editor.config.baseHref !== null ) {
+    base = editor.config.baseHref;
+  }
+  else {
+    var bdir = window.location.toString().split("/");
+    bdir.pop();
+    base = bdir.join("/");
+  }
+  
   if ( image )
   {
     outparam =
     {
-      f_base   : editor.config.baseHref,
+      f_base   : base,
       f_url    : Xinha.is_ie ? editor.stripBaseURL(image.src) : image.getAttribute("src"),
       f_alt    : image.alt,
       f_border : image.border,
       f_align  : image.align,
-      f_vert   : image.vspace,
-      f_horiz  : image.hspace,
+      f_vert   : (image.vspace!=-1 ? image.vspace : ""), //FireFox reports -1 when this attr has no value.
+      f_horiz  : (image.hspace!=-1 ? image.hspace : ""), //FireFox reports -1 when this attr has no value.
       f_width  : image.width,
       f_height : image.height
     };
   }
+  else{
+        outparam =
+        {
+      f_base   : base,
+      f_url    : ""      
+        };
+  }
+  
   Dialog(
     editor.config.URIs.insert_image,
@@ -113 +132 @@
           case "f_alt":
             if (value)
-              img.alt = value
+              img.alt = value;
             else
               img.removeAttribute("alt");
@@ -119 +138 @@
           case "f_border":
             if (value)
-              img.border = parseInt(value || "0")
+              img.border = parseInt(value || "0");
             else
               img.removeAttribute("border");
@@ -125 +144 @@
           case "f_align":
             if (value)
-              img.align = value
+              img.align = value;
             else
               img.removeAttribute("align");
@@ -131 +150 @@
           case "f_vert":
             if (value)
-              img.vspace = parseInt(value || "0")
+              img.vspace = parseInt(value || "0");
             else
               img.removeAttribute("vspace");
@@ -137 +156 @@
           case "f_horiz":
             if (value)
-              img.hspace = parseInt(value || "0")
+              img.hspace = parseInt(value || "0");
             else
               img.removeAttribute("hspace");