Changeset 408

Timestamp:

10/29/05 14:20:54 (8 years ago)

Author:

gogo

Message:

Apply #455

Location:

trunk

Files:

• htmlarea.js (modified) (2 diffs)
• plugins/ImageManager/image-manager.js (modified) (2 diffs)

trunk/htmlarea.js

@@ -3370 +3370 @@
     }
     var img = image;
-    if (!img) {
-      var sel = editor._getSelection();
-      var range = editor._createRange(sel);
-      editor._doc.execCommand("insertimage", false, param.f_url);
+    if (!img) {      
       if (HTMLArea.is_ie) {
+        var sel = editor._getSelection();
+        var range = editor._createRange(sel);
+        editor._doc.execCommand("insertimage", false, param.f_url);
         img = range.parentElement();
         // wonder if this works...
@@ -3381 +3381 @@
         }
       } else {
-        img = range.startContainer.previousSibling;
+        img = document.createElement('img');
+        img.src = param.f_url;
+        editor.insertNodeAtSelection(img);
         if (!img.tagName) {
           // if the cursor is at the beginning of the document

trunk/plugins/ImageManager/image-manager.js

@@ -166 +166 @@
                 var img = image;
                 if (!img) {
-                        var sel = editor._getSelection();
-                        var range = editor._createRange(sel);                   
-                        editor._doc.execCommand("insertimage", false, param.f_url);
                         if (HTMLArea.is_ie) {
+        var sel = editor._getSelection();
+        var range = editor._createRange(sel);
+        editor._doc.execCommand("insertimage", false, param.f_url);
                                 img = range.parentElement();
                                 // wonder if this works...
@@ -176 +176 @@
                                 }
                         } else {
-                                img = range.startContainer.previousSibling;
+                                img = document.createElement('img');
+        img.src = param.f_url;
+        editor.insertNodeAtSelection(img);
                         }
                 } else {