Changeset 988

Timestamp:

04/12/08 13:46:09 (5 years ago)

Author:

ray

Message:

• #1181 [TableOperations] IE: Table Options dialog first entry for border style faulty
  
• #1185 [TableOperations] IE: style float broken
  
• #1119 [ContextMenu] optionally switch of Firefox Spell check
  

Location:

trunk/plugins

Files:

• ContextMenu/context-menu.js (modified) (2 diffs)
• TableOperations/table-operations.js (modified) (3 diffs)

trunk/plugins/ContextMenu/context-menu.js

@@ -26 +26 @@
 };
 
+Xinha.Config.prototype.ContextMenu = {
+        disableMozillaSpellCheck : false
+}
+
 ContextMenu.prototype.onGenerate = function() {
         var self = this;
@@ -34 +38 @@
                             });
         this.currentMenu = null;
-        this.editordoc.body.spellcheck = false; // Firefox spellchecking is quite confusing for the user when they don't get the browser context menu
+        
+        if (this.editor.config.ContextMenu.disableMozillaSpellCheck) {
+                this.editordoc.body.spellcheck = false; // Firefox spellchecking is quite confusing for the user when they don't get the browser context menu
+        }
 };
 

trunk/plugins/TableOperations/table-operations.js

@@ -836 +836 @@
                         }
                         break;
-                    case "f_st_float":
-                        style.cssFloat = val;
+                        case "f_st_float":
+                        if (Xinha.is_ie) {
+                                style.styleFloat = val;
+                        }
+                        else {
+                                style.cssFloat = val;
+                        }
                         break;
 //                  case "f_st_margin":
@@ -935 +940 @@
                         option.innerHTML = Xinha._lc(Val, "TableOperations");
                         option.value = val;
-                        option.selected = (("" + el.style.cssFloat).toLowerCase() == val);
+                        if (Xinha.is_ie) {
+                                option.selected = (("" + el.style.styleFloat).toLowerCase() == val);
+                        }
+                        else {
+                                option.selected = (("" + el.style.cssFloat).toLowerCase() == val);
+                        }
                         select.appendChild(option);
                 }
@@ -1129 +1139 @@
         // That is, "top right bottom left" -- we only consider the first
         // value.
-        (currentBorderStyle.match(/([^\s]*)\s/)) && (currentBorderStyle = RegExp.$1);
-        for (var i in options) {
-    if(typeof options[i] == 'function') continue;
+        if (currentBorderStyle.match(/([^\s]*)\s/)) currentBorderStyle = RegExp.$1;
+        for (var i=0;i<options.length;i++) {
                 var val = options[i];
                 option = doc.createElement("option");
                 option.value = val;
                 option.innerHTML = val;
-                (val == currentBorderStyle) && (option.selected = true);
+                if (val == currentBorderStyle) option.selected = true;
                 select.appendChild(option);
         }