Changeset 647

Timestamp:

01/11/07 22:39:40 (13 years ago)

Author:

ray

Message:

moved loading of color_picker.js in HTMLArea.prototype._colorSelector() see #10

File:

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

trunk/htmlarea.js

@@ -1 @@
-
+ 
   /*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
     --  Xinha (is not htmlArea) - http://xinha.gogo.co.nz/
@@ -1466 +1466 @@
   }
 
-  if ( typeof colorPicker == 'undefined' )
-  {
-    HTMLArea._loadback(_editor_url + 'popups/color_picker.js', this.generate, this );
-    return false;
-  }
-
   if ( _editor_skin !== "" )
   {
@@ -3656 +3650 @@
 {
   var editor = this;    // for nested functions
+  
+  if ( typeof colorPicker == 'undefined' )
+  {
+    HTMLArea._loadback(_editor_url + 'popups/color_picker.js', function () {editor._colorSelector(cmdID)});
+    return false;
+  }
+  
   var btn = editor._toolbarObjects[cmdID].element;
   var initcolor;