Changeset 979

Timestamp:

03/20/08 12:37:41 (5 years ago)

Author:

ray

Message:

#1161 permission error from ColorPicker?.js

Files:

• trunk/modules/ColorPicker/ColorPicker.js (modified) (18 diffs)

trunk/modules/ColorPicker/ColorPicker.js

@@ -90 +90 @@
   function ColorPicker() 
   {
-        // dummy function for Xinha plugin api, note the different names
+  // dummy function for Xinha plugin api, note the different names
   }
-  if (window.opener && window.opener.Xinha)
-  { // this prevents that the Xinha.colorPicker object of the opening window is replaced by the one loaded in the popup
-        var openerColorPicker = window.opener.Xinha.colorPicker;
-        Xinha._addEvent(window,'unload', function() {Xinha.colorPicker = openerColorPicker;});
-  }
+  try {
+    if (window.opener && window.opener.Xinha)
+    { // this prevents that the Xinha.colorPicker object of the opening window is replaced by the one loaded in the popup
+      var openerColorPicker = window.opener.Xinha.colorPicker;
+      Xinha._addEvent(window,'unload', function() {Xinha.colorPicker = openerColorPicker;});
+    }
+  } catch(e) {}
   //the actual function is below
   Xinha.colorPicker = function (params)
@@ -105 +107 @@
       Xinha.colorPicker.loadColors();
     }
-        
-        this.is_ie_6 = (Xinha.is_ie && Xinha.ie_version < 7);
+
+    this.is_ie_6 = (Xinha.is_ie && Xinha.ie_version < 7);
     var picker = this;
     var enablepick = false;
@@ -128 +130 @@
     this.table.onmouseup = function()
     {
-         enablepick = false;
-         enablevalue = false;
+      enablepick = false;
+      enablevalue = false;
     };
     this.tbody = document.createElement('tbody');
@@ -197 +199 @@
     this.chosenColor.onchange = function()
       {
-        if(/#[0-9a-f]{6,6}/i.test(this.value))
-        {
-              picker.backSample.style.backgroundColor = this.value;
+        if(/#[0-9a-f]{6,6}/i.test(this.value))
+        {
+          picker.backSample.style.backgroundColor = this.value;
           picker.foreSample.style.color = this.value;
-        }
+        }
       };
 
@@ -353 +355 @@
       {
         this.chosenColor.value = initcolor;
-            this.backSample.style.backgroundColor = initcolor;
+        this.backSample.style.backgroundColor = initcolor;
         this.foreSample.style.color = initcolor;
       }
@@ -385 +387 @@
         else
         {
-                  this.table.style.top = 0;
+          this.table.style.top = 0;
         }
       }
@@ -401 +403 @@
         else
         {
-                  this.table.style.left = 0;
+          this.table.style.left = 0;
         }
       }
@@ -410 +412 @@
      // IE6 ONLY - prevent windowed elements (<SELECT>) to render above the colorpicker
       if (this.is_ie_6)
-          {
+      {
         this.iframe.style.top = this.table.style.top;
         this.iframe.style.left = this.table.style.left;
@@ -422 +424 @@
         picker.foreSample.style.color = cell.colorCode;
         if((cell.hue >= 195  && cell.saturation > 0.5) || 
-                        (cell.hue === 0 && cell.saturation === 0 && cell.value < 0.5) || 
-                        (cell.hue !== 0 && picker.value < 0.75))
+           (cell.hue === 0 && cell.saturation === 0 && cell.value < 0.5) || 
+           (cell.hue !== 0 && picker.value < 0.75))
         {
           cell.style.borderColor = '#fff';
@@ -445 +447 @@
         else
         {
-                  cell.style.borderColor = '#000';
+          cell.style.borderColor = '#000';
         }
         valuerow = cell.thisrow;
@@ -456 +458 @@
     function unpickCell(row,col)
     {
-          picker.saved_cells[row][col].style.borderColor = picker.saved_cells[row][col].colorCode;
+      picker.saved_cells[row][col].style.borderColor = picker.saved_cells[row][col].colorCode;
     }
     
@@ -510 +512 @@
             {
               enablepick = true;
-//               unpickCell(pickrow,pickcol);
+//            unpickCell(pickrow,pickcol);
               picker.saved_cells[pickrow][pickcol].style.borderColor = picker.saved_cells[pickrow][pickcol].colorCode;
               pickCell(this);
@@ -516 +518 @@
             td.onmouseover = function()
             {
-                 if(enablepick)
-                 {
-                        pickCell(this);
-                 }
+              if(enablepick)
+              {
+                pickCell(this);
+              }
             };
             td.onmouseout = function()
             {
-                 if(enablepick)
-                 {
-    //            this.style.borderColor = picker.saved_cells[this.thisrow][this.thiscol].colorCode;
+              if(enablepick)
+              {
+    //          this.style.borderColor = picker.saved_cells[this.thisrow][this.thiscol].colorCode;
                 this.style.borderColor = this.colorCode;
-                 }
+              }
             };
             td.ondblclick = function() { Xinha.colorPicker.remember(this.colorCode, picker.savecolors); picker.callback(this.colorCode); picker.close(); };
@@ -566 +568 @@
           {
             enablevalue = true;
-//            unpickCell(valuerow,valuecol);
+//          unpickCell(valuerow,valuecol);
             picker.saved_cells[valuerow][valuecol].style.borderColor = picker.saved_cells[valuerow][valuecol].colorCode;
             picker.value = this.hsv_value; 
@@ -643 +645 @@
    //           this.style.borderColor = picker.saved_cells[this.thisrow][this.thiscol].colorCode;
               this.style.borderColor = this.colorCode;
-                   }
+            }
           };
           td.ondblclick = function() { Xinha.colorPicker.remember(this.colorCode, picker.savecolors); picker.callback(this.colorCode); picker.close(); };
@@ -786 +788 @@
         this.foreSample.style.color = pickcell.colorCode;
         if((pickcell.hue >= 195  && pickcell.saturation > 0.5) || 
-                        (pickcell.hue === 0 && pickcell.saturation === 0 && pickcell.value < 0.5) || 
-                        (pickcell.hue !== 0 && picker.value < 0.75))
+           (pickcell.hue === 0 && pickcell.saturation === 0 && pickcell.value < 0.5) || 
+           (pickcell.hue !== 0 && picker.value < 0.75))
         {
            pickcell.style.borderColor = '#fff';
@@ -793 +795 @@
         else
         {
-                  pickcell.style.borderColor = '#000';
+          pickcell.style.borderColor = '#000';
         }
       }
@@ -892 +894 @@
   { 
     var colPicker = new Xinha.colorPicker(pickerConfig);
-          colPicker.open("",chooser, input.value ); 
+    colPicker.open("",chooser, input.value ); 
   }
   Xinha.freeLater(this,"chooser");