Changeset 1075

Timestamp:

10/09/08 17:02:30 (2 months ago)

Author:

nicholasbs

Message:

UPDATES #1283 (new-dialogs version of TableOperations is incomplete)
ids/names are now properly added to the dialog reverse lookup table

Location:

trunk

Files:

• modules/Dialogs/XinhaDialog.js (modified) (2 diffs)
• modules/InlineStyler/InlineStyler.js (modified) (19 diffs)
• plugins/TableOperations/TableOperations.js (modified) (3 diffs)

trunk/modules/Dialogs/XinhaDialog.js

@@ -1038 +1038 @@
     function(fullString, id)
     {
-      if(typeof dialog.id[id] == 'undefined')
-      {
-        dialog.id[id] = Xinha.uniq('Dialog');
-        dialog.r_id[dialog.id[id]] = id;
-      }
-      return dialog.id[id];
+      return dialog.createId(id);
     }
     ).replace(/<l10n>(.*?)<\/l10n>/ig,
@@ -1058 +1053 @@
   return html;
 }
+
+/** Use this function when adding an element with a new ID/name to a 
+ *  dialog after it has already been created. This function ensures
+ *  that the dialog has the id/name stored in its reverse-lookup table
+ *  (which is required for form values to be properly returned by
+ *  Xinha.Dialog.hide).
+ * 
+ * @param {id} the id (or name) to add 
+ *
+ * Returns the internal ID to which the passed in ID maps
+ *
+ * TODO: createId is a really awful name, but I can't think of anything better...
+ */
+Xinha.Dialog.prototype.createId = function(id)
+{
+  var dialog = this;
+  if (typeof dialog.id[id] == 'undefined')
+  {
+    dialog.id[id] = Xinha.uniq('Dialog');
+    dialog.r_id[dialog.id[id]] = id;
+  }
+  return dialog.id[id];
+};
 
 /** When several modeless dialogs are shown, one can be brought to front with this function (as happens on mouseclick) 

trunk/modules/InlineStyler/InlineStyler.js

@@ -1 @@
-Xinha.InlineStyler = function(element, editor, doc)
+Xinha.InlineStyler = function(element, editor, dialog, doc)
 {
   this.element = element;
   this.editor = editor;
+  this.dialog = dialog;
   this.doc = doc ? doc : document;
   this.inputs = {
@@ -32 +33 @@
     if (typeof params[i] == 'function') 
       continue;
-    var val = params[i].value;
+    if (params[i] != null)
+      var val = params[i].value || params[i];
+
     switch (i)
     {
@@ -46 +49 @@
       break;
     case "borderCollapse":
-      style.borderCollapse =  params[i].checked ? "collapse" : "";
+      style.borderCollapse = params[i] == "on" ? "collapse" : "separate";
       break;
     case "width":
@@ -109 +112 @@
       break;
     case "borderWidth":
-      var borderWidthUnit = this.inputs.aux["heightUnit"].value;
-      style[i] = val + (borderWidthUnit) ? borderWidthUnit : 'px';
-      break;
-    default:
+      style[i] = val + "px";
+      break;
+    default:      
       style[i] = val;
       break;
@@ -155 +157 @@
     tr.appendChild(td);
     select = doc.createElement("select");
+    select.name = this.dialog.createId("float");
     td.appendChild(select);
     this.inputs.styles['float'] = select;
@@ -185 +188 @@
   tr.appendChild(td);
   input = doc.createElement("input");
+  input.name = this.dialog.createId("width");
   input.type = "text";
   input.value = Xinha.InlineStyler.getLength(el.style.width);
@@ -192 +196 @@
   td.appendChild(input);
   select = doc.createElement("select");
+  select.name = this.dialog.createId("widthUnit");
   this.inputs.aux['widthUnit'] = select;
   option = doc.createElement("option");
@@ -208 +213 @@
   td.appendChild(doc.createTextNode(Xinha._lc("Text align", "TableOperations") + ":"));
   select = doc.createElement("select");
+  select.name = this.dialog.createId("textAlign");
   select.style.marginLeft = select.style.marginRight = "0.5em";
   td.appendChild(select);
@@ -218 +224 @@
   input = doc.createElement("input");
   this.inputs.aux['textAlignChar'] = input;
-  input.name= 'fuck';
+  input.name= this.dialog.createId("textAlignChar");
   input.size = "1";
   input.style.fontFamily = "monospace";
@@ -258 +264 @@
   tr.appendChild(td);
   input = doc.createElement("input");
+  input.name = this.dialog.createId("height");
   input.type = "text";
   input.value = Xinha.InlineStyler.getLength(el.style.height);
@@ -265 +272 @@
   td.appendChild(input);
   select = doc.createElement("select");
+  select.name = this.dialog.createId("heightUnit");
   this.inputs.aux['heightUnit'] = select;
   option = doc.createElement("option");
@@ -281 +289 @@
   td.appendChild(doc.createTextNode(Xinha._lc("Vertical align", "TableOperations") + ":"));
   select = doc.createElement("select");
+  select.name = this.dialog.createId("verticalAlign");
   this.inputs.styles['verticalAlign'] = select;
   select.style.marginLeft = "0.5em";
@@ -330 +339 @@
 
   input = doc.createElement("input");
+  input.name = this.dialog.createId("backgroundColor");
   input.value = Xinha._colorToRgb( el.style.backgroundColor );
   input.type = "hidden";
@@ -337 +347 @@
   new Xinha.colorPicker.InputBinding(input)
   
-  td.appendChild(doc.createTextNode(Xinha._lc("Image URL", "TableOperations") + ": "));
-  input = doc.createElement("input");
+  td.appendChild(doc.createTextNode(" " + Xinha._lc("Image URL", "TableOperations") + ": "));
+  input = doc.createElement("input");
+  input.name = this.dialog.createId("backgroundImage");
   input.type = "text";
   this.inputs.styles['backgroundImage'] = input;
-  if (el.style.backgroundImage.match(/url\(\s*(.*?)\s*\)/)) 
-  {
+  if (el.style.backgroundImage.match(/url\(\s*(.*?)\s*\)/))
     input.value = RegExp.$1;
-  }
   // input.style.width = "100%";
   td.appendChild(input);
@@ -357 +366 @@
   tr.appendChild(td);
   input = doc.createElement("input");
+  input.name = this.dialog.createId("color");
   input.value = Xinha._colorToRgb( el.style.color );
   input.type = "hidden";
@@ -379 +389 @@
   tr.appendChild(td);
   input = doc.createElement("input");
+  input.name = this.dialog.createId("borderColor");
   input.value = Xinha._colorToRgb( el.style.borderColor );
   input.type = "hidden";
@@ -387 +398 @@
   
   select = doc.createElement("select");
+  select.name = this.dialog.createId("borderStyle");
   var borderFields = [];
   td.appendChild(select);
@@ -424 +436 @@
   
   input = doc.createElement("input");
+  input.name = this.dialog.createId("borderWidth");
   borderFields.push(input);
   input.type = "text";
@@ -447 +460 @@
     tr.appendChild(td);
     input = doc.createElement("input");
+    input.name = this.dialog.createId("borderCollapse");
     input.type = "checkbox";
     this.inputs.styles['borderCollapse'] = input;

trunk/plugins/TableOperations/TableOperations.js

@@ -503 +503 @@
   var dialog = this.dialogTable;
   
-  var Styler = new Xinha.InlineStyler(table, this.editor);
+  var Styler = new Xinha.InlineStyler(table, this.editor, dialog);
   
   function apply() {
@@ -512 +512 @@
       if(typeof params[i] == 'function') continue;
       var val = params[i];
-      if (typeof val == 'object' && val.tagName) val = val.value;
+      //if (val == null) continue;
+      if (typeof val == 'object' && val != null && val.tagName) val = val.value;
       switch (i) {
       case "caption":
@@ -619 +620 @@
   var dialog = this.dialogRowCell;
   dialog.getElementById('title').innerHTML = cell ? Xinha._lc("Cell Properties", "TableOperations") : Xinha._lc("Row Properties", "TableOperations");
-  var Styler = new Xinha.InlineStyler(element, self.editor);
+  var Styler = new Xinha.InlineStyler(element, self.editor, dialog);
   
   function apply() {
     var params = dialog.hide();
-    Styler.applyStyle();
+    Styler.applyStyle(params);
     
     // various workarounds to refresh the table display (Gecko,