Changeset 791

Timestamp:

03/19/07 16:27:42 (6 years ago)

Author:

ray

Message:

updated branch

Location:

branches/ray

Files:

• XinhaCore.js (modified) (1 diff)
• XinhaLoader.js (modified) (1 diff)
• examples/testbed.html (modified) (2 diffs)
• modules/ColorPicker/ColorPicker.js (modified) (1 diff)
• modules/Dialogs/XinhaDialog.js (modified) (15 diffs)
• modules/InsertImage/InsertImage.js (modified) (1 diff)
• plugins/CharacterMap/character-map.js (modified) (1 diff)
• plugins/ExtendedFileManager/images.php (modified) (3 diffs)
• plugins/Stylist/stylist.js (modified) (1 diff)

branches/ray/XinhaCore.js

@@ -5742 +5742 @@
   document.body.appendChild(loading_message);
   
+  Xinha.freeLater(loading_message);
+  Xinha.freeLater(loading_main);
+  Xinha.freeLater(loading_sub);
+  
   return loading_sub;
 };

branches/ray/XinhaLoader.js

@@ -22 +22 @@
   Xinha.createLoadingMessages(xinha_editors);
   var loadingMessages = Xinha.loadingMessages;
-  Xinha._loadback(_editor_url + "XinhaCore.js",function () { 
+  Xinha._loadback(_editor_url + "XinhaCore.js",function () {
     Xinha.removeLoadingMessages(xinha_editors);  
     Xinha.createLoadingMessages(xinha_editors);  

branches/ray/examples/testbed.html

@@ -63 +63 @@
        [
          'CharacterMap', 
-         'Linker',
-         'Stylist',
-         'SmartReplace'
+        // 'Linker',
+        // 'Stylist',
+        // 'SmartReplace'
        ];
              // THIS BIT OF JAVASCRIPT LOADS THE PLUGINS, NO TOUCHING  :)
@@ -87 +87 @@
        //  xinha_config.stylistLoadStylesheet(document.location.href.replace(/[^\/]*\.html/, 'stylist.css'));
          
-      xinha_config.CharacterMap.mode = 'panel';
-xinha_config.stylistLoadStylesheet(document.location.href.replace(/[^\/]*\.html/, 'stylist.css'));
+      //xinha_config.CharacterMap.mode = 'panel';
+//xinha_config.stylistLoadStylesheet(document.location.href.replace(/[^\/]*\.html/, 'stylist.css'));
 
 /*

branches/ray/modules/ColorPicker/ColorPicker.js

@@ -892 +892 @@
           colPicker.open("",chooser, input.value ); 
   }
+  Xinha.freeLater(this,"chooser");
 }
 Xinha.colorPicker.InputBinding.prototype.setColor = function (color)

branches/ray/modules/Dialogs/XinhaDialog.js

@@ -37 +37 @@
   this.editor   = editor;
   this.document = document;
+  this.size = size;
   this.modal = (options && options.modal === false) ? false : true;
   this.closable = (options && options.closable === false) ? false : true;
   this.layer = (options && options.layer) ? options.layer : 0;
   
-  if ( !this.background )
-  {
-        this.background = [];
-        
-    if (Xinha.is_ie)
-    { // IE6 needs the iframe to hide select boxes
-      var backG = document.createElement("iframe");
-      backG.src = "about:blank";
-    }
-    else 
-    { // Mozilla (<FF3) can't have the iframe, because it hides the caret in text fields 
-      // see https://bugzilla.mozilla.org/show_bug.cgi?id=226933
-      // unfortunately https://bugzilla.mozilla.org/show_bug.cgi?id=230701 indicates that this is an issue with pos fixed div, too
-      var backG = document.createElement("div");
-    }
-    backG.className = "xinha_dialog_background";
-    with (backG.style)
-    {
-      position = "absolute";//(Xinha.is_ie) ? "absolute" : "fixed"; 
-      top = 0;
-      left = 0;
-      border = 'none';
-      overflow = "hidden";
-      display = "none";
-      zIndex = (this.modal ? 1025 : 1001 ) + this.layer;
-    }
-    document.body.appendChild(backG);
-    this.background.push(backG);
-    
-    backG = document.createElement("div");
-    with (backG.style)
-    {
-      position =  "absolute";
-      top = 0;
-      left = 0;
-      overflow = "hidden";
-      display = "none";
-      zIndex = (this.modal ? 1026 : 1002 ) + this.layer;
-    } 
-    document.body.appendChild(backG);
-    this.background.push(backG);
-    backG = null;
-    Xinha.freeLater(this.background);
-  }
+  
+  if (Xinha.is_ie)
+  { // IE6 needs the iframe to hide select boxes
+    var backG = document.createElement("iframe");
+    backG.src = "about:blank";
+    backG.onreadystatechange = function () 
+    {
+      var doc = window.event.srcElement.contentWindow.document;
+      if (doc && doc.body)
+      {
+        doc.body.style.backgroundColor = "#666666";
+      }
+    }
+  }
+  else
+  { // Mozilla (<FF3) can't have the iframe, because it hides the caret in text fields
+    // see https://bugzilla.mozilla.org/show_bug.cgi?id=226933
+    var backG = document.createElement("div");
+  }
+  backG.className = "xinha_dialog_background";
+  with (backG.style)
+  {
+    position = "absolute";
+    top = 0;
+    left = 0;
+    border = 'none';
+    overflow = "hidden";
+    display = "none";
+    zIndex = (this.modal ? 1025 : 1001 ) + this.layer;
+  }
+  document.body.appendChild(backG);
+  this.background = backG;
+
+  backG = null;
+  Xinha.freeLater(this, "background");
+
   var rootElem = document.createElement('div');
   //I've got the feeling dragging is much slower in IE7 w/ pos:fixed, besides the strange fact that it only works in Strict mode 
@@ -106 +99 @@
 
   rootElem.style.paddingBottom = "10px";
-  rootElem.style.width = size.width + 'px';
-
-  
-  this.size = size;
+  rootElem.style.width = size.width  ? size.width + 'px' : '';
+
   if (size.height)
   {
@@ -122 +113 @@
   }
 
-  if(typeof localizer == 'function')
-  {
-    this._lc = localizer;
-  }
-  else if(localizer)
-  {
-    this._lc = function(string)
-    {
-      return Xinha._lc(string,localizer);
-    };
-  }
-  else
-  {
-    this._lc = function(string)
-    {
-      return string;
-    };
-  }
-
-  html = this.translateHtml(html)
+  html = this.translateHtml(html,localizer)
 
   var main = document.createElement('div');
@@ -154 +126 @@
   captionBar.style.MozUserSelect = "none";
   
-  var closer = null;
+  this.buttons = document.createElement('div');
+  with (this.buttons.style)
+  {
+    position = "absolute";
+    top = "0";
+    right = "2px";
+  }
+  rootElem.appendChild(this.buttons);
+  
+  this.closer = null;
   if ( this.closable )
   {
-    var closer = document.createElement('div');
-    closer.className= 'closeButton'; 
-    
-    closer.onmousedown = function(ev) { this.className = "closeButton buttonClick"; Xinha._stopEvent((ev) ? ev : window.event); return false;};
-    closer.onmouseout = function(ev) { this.className = "closeButton"; Xinha._stopEvent((ev) ? ev : window.event); return false;};
-    closer.onmouseup = function() { this.className = "closeButton"; dialog.hide(); return false;};
-    captionBar.appendChild(closer);
+    this.closer = document.createElement('div');
+    this.closer.className= 'closeButton'; 
+      
+    this.closer.onmousedown = function(ev) { this.className = "closeButton buttonClick"; Xinha._stopEvent((ev) ? ev : window.event); return false;};
+    this.closer.onmouseout = function(ev) { this.className = "closeButton"; Xinha._stopEvent((ev) ? ev : window.event); return false;};
+    this.closer.onmouseup = function() { this.className = "closeButton"; dialog.hide(); return false;};
+  
+    this.buttons.appendChild(this.closer);
   
     var butX = document.createElement('span');
@@ -170 +152 @@
     butX.style.top = '-3px';
   
-    butX.appendChild(document.createTextNode('\u00D7'));
-    closer.appendChild(butX);
+    butX.appendChild(document.createTextNode('\u00D7')); // cross
+    //butX.appendChild(document.createTextNode('\u25AC')); //bar
+    //butX.appendChild(document.createTextNode('\u25BA')); //triangle right
+    //butX.appendChild(document.createTextNode('\u25B2')); //triangle up
+    //butX.appendChild(document.createTextNode('\u25BC')); //triangle down
+    this.closer.appendChild(butX);
     butX = null;
   }
   
-  var icon = document.createElement('img');
-  icon.className = 'icon';
-  icon.src = _editor_url + 'images/xinha-small-icon.gif';
-  icon.style.position = 'absolute';
-  icon.style.top = '3px';
-  icon.style.left = '2px';
+  this.icon = document.createElement('img');
+  with (this.icon)
+  {
+    className = 'icon';
+    src = _editor_url + 'images/xinha-small-icon.gif';
+    style.position = 'absolute';
+    style.top = '3px';
+    style.left = '2px';
+  }
   captionBar.style.paddingLeft = '22px';
-  captionBar.appendChild(icon);
-  
+  rootElem.appendChild(this.icon);
   
   var all = rootElem.getElementsByTagName("*");
@@ -201 +189 @@
   }
 
-  var resizeHandle = document.createElement('div');
-  resizeHandle.className = "resizeHandle";
-  with (resizeHandle.style)
+  this.resizer = document.createElement('div');
+  this.resizer.className = "resizeHandle";
+  with (this.resizer.style)
   {
     position = "absolute";
@@ -209 +197 @@
     right= "0px";
   }
-  resizeHandle.onmousedown = function(ev) { dialog._resizeStart(ev); };
-  rootElem.appendChild(resizeHandle);
+  this.resizer.onmousedown = function(ev) { dialog._resizeStart(ev); };
+  rootElem.appendChild(this.resizer);
   
   this.rootElem = rootElem;
   this.captionBar = captionBar;
   this.main = main;
-  this.closer = closer;
-  this.icon = icon;
-  this.resizer = resizeHandle;
-  
-  captionBar = 
-  rootElem = 
-  rootElem =
-  main = 
-  closer = 
-  icon = 
+  
+  captionBar = null;
+  rootElem = null;
+  main = null;
   resizeHandle = null;
   
-  Xinha.freeLater(this,'rootElem');
+  Xinha.freeLater(this,"rootElem");
+  Xinha.freeLater(this,"captionBar");
+  Xinha.freeLater(this,"main");
+  Xinha.freeLater(this, "buttons");
+  Xinha.freeLater(this, "closer");
+  Xinha.freeLater(this, "icon");
+  Xinha.freeLater(this, "resizer");
+  Xinha.freeLater(this, "document");
   
   // for caching size & position after dragging & resizing
@@ -233 +222 @@
 
 };
-
-Xinha.Dialog.activateModeless = function(dialog)
-{
-  var zIndex;
-  if (Xinha.Dialog.activeModeless == dialog || dialog.attached ) 
-  {
-    return;
-  }
-  
-  if (Xinha.Dialog.activeModeless )
-  {
-    Xinha.Dialog.activeModeless.rootElem.style.zIndex = parseInt(Xinha.Dialog.activeModeless.rootElem.style.zIndex) -10;
-  }
-  Xinha.Dialog.activeModeless = dialog;
-
-  Xinha.Dialog.activeModeless.rootElem.style.zIndex = parseInt(Xinha.Dialog.activeModeless.rootElem.style.zIndex) + 10;
-}
-
-Xinha.Dialog.prototype.sizeBackground = function()
-{
-  var pageSize = Xinha.pageSize();
-
-  if ( this.modal )
-  {
-    this.resizeBackground({width: pageSize.x + 'px', height: pageSize.y + 'px'});
-  }
-  //window.scroll(this.scrollPos.x, this.scrollPos.y);
-}
 
 Xinha.Dialog.prototype.onresize = function()
@@ -291 +252 @@
   {
     dialog.saveSelection = function() { dialog._lastRange = dialog.editor.saveSelection();};
-    Xinha._addEvent(this.editor._doc.body,'mouseup', dialog.saveSelection);
+    Xinha._addEvent(this.editor._doc,'mouseup', dialog.saveSelection);
   }
 
@@ -304 +265 @@
   }
   
-  if ( !this.attached)
+  if ( !this.attached )
   {
     this.showBackground();
     var viewport = Xinha.viewportSize();
-    this.sizeBackground();
+    if ( modal )
+    {
+      var pageSize = Xinha.pageSize();
+      this.resizeBackground({width:pageSize.x + "px",height:pageSize.y + "px"});
+    }
     var viewportHeight = viewport.y;
     var viewportWidth = viewport.x;
@@ -382 +347 @@
   if (!modal)
   {
-    this.sizeBackground({width: dialogWidth + 'px', height: dialogHeight + 'px' });
+    this.resizeBackground({width: dialogWidth + 'px', height: dialogHeight + 'px' });
     this.posBackground({top:  rootElemStyle.top, left: rootElemStyle.left});
   }
@@ -419 +384 @@
     if (Xinha.is_ie && !this.modal)
     {
-      Xinha._removeEvent(this.editor._doc.body,'mouseup', dialog.saveSelection);
+      Xinha._removeEvent(this.editor._doc,'mouseup', dialog.saveSelection);
     }
 
@@ -688 +653 @@
 Xinha.Dialog.prototype.hideBackground = function()
 {
-  this.background[0].style.display = 'none';
-  this.background[1].style.display = 'none';
+  this.background.style.display = 'none';
 }
 Xinha.Dialog.prototype.showBackground = function()
 {
-  this.background[0].style.display = '';
-  this.background[1].style.display = '';
+  this.background.style.display = '';
 }
 Xinha.Dialog.prototype.posBackground = function(pos)
 {
-  this.background[0].style.top  = pos.top;
-  this.background[0].style.left = pos.left;
-  this.background[1].style.top  = pos.top;
-  this.background[1].style.left = pos.left;
+  this.background.style.top  = pos.top;
+  this.background.style.left = pos.left;
 }
 Xinha.Dialog.prototype.resizeBackground = function(size)
 {
-  this.background[0].style.width  = size.width;
-  this.background[0].style.height = size.height;
-  this.background[1].style.width  = size.width;
-  this.background[1].style.height = size.height;
+  this.background.style.width  = size.width;
+  this.background.style.height = size.height;
 }
 Xinha.Dialog.prototype.posDialog = function(pos)
@@ -916 +875 @@
 };
 
-Xinha.Dialog.prototype.translateHtml = function(html)
-{
-  var dialog = this;
+Xinha.Dialog.prototype.translateHtml = function(html,localizer)
+{
+  var dialog = this;
+  if(typeof localizer == 'function')
+  {
+    dialog._lc = localizer;
+  }
+  else if(localizer)
+  {
+    this._lc = function(string)
+    {
+      return Xinha._lc(string,localizer);
+    };
+  }
+  else
+  {
+    this._lc = function(string)
+    {
+      return string;
+    };
+  }
+  
   html = html.replace(/\[([a-z0-9_]+)\]/ig,
     function(fullString, id)
@@ -943 +921 @@
 }
 
+
+Xinha.Dialog.activateModeless = function(dialog)
+{
+  var zIndex;
+  if (Xinha.Dialog.activeModeless == dialog || dialog.attached ) 
+  {
+    return;
+  }
+  
+  if (Xinha.Dialog.activeModeless )
+  {
+    Xinha.Dialog.activeModeless.rootElem.style.zIndex = parseInt(Xinha.Dialog.activeModeless.rootElem.style.zIndex) -10;
+  }
+  Xinha.Dialog.activeModeless = dialog;
+
+  Xinha.Dialog.activeModeless.rootElem.style.zIndex = parseInt(Xinha.Dialog.activeModeless.rootElem.style.zIndex) + 10;
+}

branches/ray/modules/InsertImage/InsertImage.js

@@ -101 +101 @@
         this.dialog.onresize = function ()
         {
-                this.getElementById("ipreview").style.height = 
+                
+                
+                var newHeightForPreview = 
                 parseInt(this.height,10) 
                 - this.getElementById('h1').offsetHeight 
                 - this.getElementById('buttons').offsetHeight
                 - this.getElementById('inputs').offsetHeight 
-                - parseInt(this.rootElem.style.paddingBottom,10) // we have a padding at the bottom, gotta take this into acount
-                + 'px'; // don't forget this ;)
+                - parseInt(this.rootElem.style.paddingBottom,10); // we have a padding at the bottom, gotta take this into acount
                 
-                this.getElementById("ipreview").style.width =(this.width - 2) + 'px'; // and the width
+                
+                this.getElementById("ipreview").style.height = ((newHeightForPreview > 0) ? newHeightForPreview : 0) + "px"; // no-go beyond 0
+                
+                this.getElementById("ipreview").style.width = this.width - 2   + 'px'; // and the width
 
         }

branches/ray/plugins/CharacterMap/character-map.js

@@ -59 +59 @@
     return false;
   };
-  this.dialog.rootElem.appendChild( a );
+  this.dialog.main.appendChild( a );
   a = null;
 };

branches/ray/plugins/ExtendedFileManager/images.php

@@ -27 +27 @@
 
 //process paste
-if (isset($_GET['paste']))
-        $pasteStatus = $manager->processPaste();
-
-if ($manager->deleteFiles())
-    $refreshFile = true;
+$pasteStatus = (isset($_GET['paste'])) ?        $manager->processPaste() : false;
+
+$refreshFile = ($manager->deleteFiles()) ? true : false;
 
 $refreshDir = false;
@@ -51 +49 @@
 }
 
-
-$afruViewType="";
-if(isset($_REQUEST['viewtype']))
-{
-        $afruViewType=$_REQUEST['viewtype'];
-}
+$afruViewType = (isset($_REQUEST['viewtype'])) ? $afruViewType=$_REQUEST['viewtype'] : '';
+
 if($afruViewType!="thumbview" && $afruViewType!="listview")
-
-$afruViewType=$IMConfig['view_type'];
-
+{
+  $afruViewType=$IMConfig['view_type'];
+}
 //get the list of files and directories
 $list = $manager->getFiles($relative);
@@ -139 +133 @@
                     <a href="#" title="Cut" onclick="copyFile('<?php echo rawurlencode($entry);?>','move'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_cut.gif" height="15" width="15" alt="Cut" /></a>
                      <a href="#" title="Copy" onclick="copyFile('<?php echo rawurlencode($entry);?>','copy'); return false;"><img src="<?php print $IMConfig['base_url'];?>img/edit_copy.gif" height="15" width="15" alt="Copy" /></a>
-                    <?php $thisFileNameLength -= 6; }  ?>
+                    <?php }  ?>
                   </td>
                 </tr>

branches/ray/plugins/Stylist/stylist.js

@@ -782 +782 @@
   this.dialog = new Xinha.Dialog(editor, html, 'Stylist',{width:200},{modal:false,closable:false});
         Xinha._addClass( this.dialog.rootElem, 'Stylist' );
-        this.dialog.attachToPanel('right');
+        //this.dialog.attachToPanel('right');
   this.dialog.show();