Changeset 1260 for trunk

Timestamp:

05/11/10 07:31:04 (2 years ago)

Author:

gogo

Message:

#1471 and #1508 Better fix for IE8 TableOperations (and others) and editing inside absolute positioned elements.

Location:

trunk

Files:

• XinhaCore.js (modified) (3 diffs)
• modules/InlineStyler/InlineStyler.js (modified) (1 diff)
• modules/InternetExplorer/InternetExplorer.js (modified) (2 diffs)
• plugins/TableOperations/TableOperations.js (modified) (1 diff)

trunk/XinhaCore.js

@@ -1547 +1547 @@
   // ._toolbar is for legacy, ._toolBar is better thanks.
   this._toolBar = this._toolbar = toolbar;
-  toolbar.className = "toolbar";
-  toolbar.unselectable = "1";
+  toolbar.className = "toolbar";  
   toolbar.align = this.config.toolbarAlign;
   
@@ -1559 +1558 @@
 
         this._createToolbar1(editor, toolbar, tb_objects);
+        
+        // IE8 is totally retarded, if you click on a toolbar element (eg button)
+        // and it doesn't have unselectable="on", then it defocuses the editor losing the selection
+        // so nothing works.  Particularly prevalent with TableOperations
+        function noselect(e)
+        {
+    if(e.tagName) e.unselectable = "on";        
+    if(e.childNodes)
+    {
+      for(var i = 0; i < e.childNodes.length; i++) if(e.tagName) noselect(e.childNodes(i));
+    }
+        }
+        noselect(toolbar);
+        
+        
         this._htmlArea.appendChild(toolbar);      
   
@@ -3615 +3629 @@
           editor.sizeEditor(); 
         }
-      });
+      });      
       editor.removeLoadingMessage();
     }

trunk/modules/InlineStyler/InlineStyler.js

@@ -112 +112 @@
       break;
     case "borderWidth":
-      style[i] = val + "px";
+      style[i] = val ? val + "px" : '0px';
       break;
     default:      

trunk/modules/InternetExplorer/InternetExplorer.js

@@ -363 +363 @@
       // certainly the buggiest browser in the world and I
       // wonder, God, how can Earth stand it?
-      return range.parentElement();
+      try
+      {
+        return range.parentElement();
+      }
+      catch(e)
+      {
+        return this._doc.body; // ??
+      }
+      
     case "Control":
       return range.item(0);
@@ -448 +456 @@
  * @returns Range
  */
-Xinha.prototype.saveSelection = function()
-{
-  return this.createRange(this.getSelection())
+Xinha.prototype.saveSelection = function(sel)
+{
+  return this.createRange(sel ? sel : this.getSelection())
 }
 /** 

trunk/plugins/TableOperations/TableOperations.js

@@ -535 +535 @@
         table.summary = val;
         break;
-      case "width":
-        table.style.width = ("" + val) + params.f_unit;
-        break;
       case "align":
         table.align = val;