Changeset 1316

Timestamp:

06/16/12 02:44:39 (1 year ago)

Author:

gogo

Message:

Further IE Fixes #1581 #1524

Location:

trunk/plugins/MootoolsFileManager

Files:

• MootoolsFileManager.FileManager.js (modified) (2 diffs)
• MootoolsFileManager.ImageManager.js (modified) (5 diffs)

trunk/plugins/MootoolsFileManager/MootoolsFileManager.FileManager.js

@@ -106 +106 @@
       });       
     }
-    
+    if(Xinha.is_ie) this.current_selection = this.editor.saveSelection();
     this.FileManagerWidget.show();    
 };
@@ -118 +118 @@
   var param = this.FileManagerAttributes();  
   param.f_href = path;
-    
+  if(Xinha.is_ie) this.editor.restoreSelection(this.current_selection);  
   if (!a)
   {

trunk/plugins/MootoolsFileManager/MootoolsFileManager.ImageManager.js

@@ -105 +105 @@
   }
   
+  if(Xinha.is_ie) this.current_selection = this.editor.saveSelection();
   this.ImageManagerWidget.show();    
 };
@@ -514 +515 @@
 MootoolsFileManager.prototype.ImageManagerReturn = function(path, file)
 {
+  
   var editor = this.editor;
   var self   = this;
@@ -520 +522 @@
   var param = self.ImageManagerAttributes();  
   param.f_url = path;
+  
+  if(Xinha.is_ie) this.editor.restoreSelection(this.current_selection);
   
   var img = image;
@@ -528 +532 @@
       editor._doc.execCommand("insertimage", false, param.f_url);
       img = range.parentElement();
+            
       // wonder if this works...
       if (img.tagName.toLowerCase() != "img") {
@@ -591 +596 @@
         break;
         
-        case "f_align"  : if(value && value !== true) { img.align  = value; } else { img.removeAttribute('align'); } break;
+        case "f_align"  : if(value && value !== true && value !== 'true') { img.align  = value; } else { img.removeAttribute('align'); } break;
           
         case "f_width" :