Changeset 550

Timestamp:

08/10/06 21:49:07 (7 years ago)

Author:

mokhet

Message:

change ugly popup color selectors to nice colorPicker widget. see ticket #85

Files:

• trunk/htmlarea.js (modified) (4 diffs)

trunk/htmlarea.js

@@ -362 +362 @@
   this.showLoading = false;
 
+  // size of color picker cells
+  this.colorPickerGranularity = '6px';
+  // position of color picker from toolbar button
+  this.colorPickerPosition = 'bottom,right';
+
   /** CUSTOMIZING THE TOOLBAR
    * -------------------------
@@ -1438 +1443 @@
   {
     HTMLArea._loadback(_editor_url + 'popupwin.js', this.generate, this );
+    return false;
+  }
+
+  if ( typeof colorPicker == 'undefined' )
+  {
+    HTMLArea._loadback(_editor_url + 'popups/color_picker.js', this.generate, this );
     return false;
   }
@@ -4227 +4238 @@
 {
   var editor = this;    // for nested functions
+  var btn = editor._toolbarObjects[cmdID].element;
   if ( cmdID == 'hilitecolor' )
   {
@@ -4242 +4254 @@
     }
   }
-  this._popupDialog(
-    editor.config.URIs.select_color,
-    function(color)
-    {
-      // selection not canceled
-      if ( color )
-      {
-        editor._doc.execCommand(cmdID, false, "#" + color);
-      }
-    },
-    HTMLArea._colorToRgb(this._doc.queryCommandValue(cmdID)));
+  var picker = new colorPicker({cellsize:editor.config.colorPickerGranularity,callback:function(color){editor._doc.execCommand(cmdID, false, color);}});
+  picker.open(editor.config.colorPickerPosition, btn);
 };