Changeset 774

Timestamp:

03/13/07 12:03:09 (6 years ago)

Author:

ray

Message:

updated branch

Location:

branches/ray

Files:

• examples/testbed.html (modified) (2 diffs)
• modules/Dialogs/inline-dialog.js (modified) (6 diffs)
• plugins/Linker/linker.js (modified) (2 diffs)
• plugins/SmartReplace/smart-replace.js (modified) (1 diff)

branches/ray/examples/testbed.html

@@ -54 +54 @@
       xinha_plugins = xinha_plugins ? xinha_plugins :
       [
-        'CharacterMap', 'SpellChecker', 'SmartReplace','PasteText','SuperClean'
-        //'Linker'//,'GetHtml'
+        //'CharacterMap', 
+        //'SpellChecker', 
+       //'SmartReplace'//,
+        //'PasteText'//,'SuperClean',
+        'Linker'//,'GetHtml'
       ];
              // THIS BIT OF JAVASCRIPT LOADS THE PLUGINS, NO TOUCHING  :)
@@ -89 +92 @@
    xinha_config.height = 300;
        xinha_config.fullPage = false;
-       xinha_config.CharacterMap.mode = 'panel';
+      // xinha_config.CharacterMap.mode = 'panel';
        xinha_config.toolbar =
   [
-    ["popupeditor"],
-    ["separator","formatblock","fontname","fontsize","bold","italic","underline","strikethrough"],
-    ["separator","forecolor","hilitecolor","textindicator"],
-    ["separator","subscript","superscript"],
-    ["linebreak","separator","justifyleft","justifycenter","justifyright","justifyfull"],
-    ["separator","insertorderedlist","insertunorderedlist","outdent","indent"],
-    ["separator","inserthorizontalrule","createlink","insertimage","inserttable"],
-    ["linebreak","separator","undo","redo","selectall","print"], (Xinha.is_gecko ? [] : ["cut","copy","paste","overwrite","saveas"]),
-    ["separator","killword","clearfonts","removeformat","toggleborders","splitblock","lefttoright", "righttoleft"],
-    ["separator","htmlmode","showhelp","about"]
+   ["htmlmode","formatblock"]
   ];
 /*

branches/ray/modules/Dialogs/inline-dialog.js

@@ -58 +58 @@
     document.body.appendChild(backG);
     Xinha.Dialog.background[this.layer].push(backG);
-  
+    
     backG = document.createElement("div");
     with (backG.style)
@@ -71 +71 @@
     document.body.appendChild(backG);
     Xinha.Dialog.background[this.layer].push(backG);
+    backG = null;
+    Xinha.freeLater(Xinha.Dialog.background[this.layer]);
   }
   var rootElem = document.createElement('div');
@@ -157 +159 @@
   but.onmouseup = function() { this.className = "closeButton"; dialog.hide(); return false;};
   titleBar.appendChild(but);
-  
+
   var butX = document.createElement('span');
+  butX.className = 'innerX';
   butX.style.position = 'relative';
   butX.style.top = '-3px';
@@ -164 +167 @@
   butX.appendChild(document.createTextNode('\u00D7'));
   but.appendChild(butX);
-  
+  butX = null;
+  but = null;
   var icon = document.createElement('img');
+  icon.className = 'icon';
   icon.src = _editor_url + 'images/xinha-small-icon.gif';
   icon.style.position = 'absolute';
@@ -172 +177 @@
   titleBar.style.paddingLeft = '30px';
   titleBar.appendChild(icon);
-   
+  icon = null;
+  
   var all = rootElem.getElementsByTagName("*");
 
@@ -199 +205 @@
   resizeHandle.onmousedown = function(ev) { dialog._resizeStart(ev); };
   rootElem.appendChild(resizeHandle);
+  resizeHandle = null;
   this.rootElem = rootElem;
   // for caching size & position after dragging & resizing
   this.size = {};
+  titleBar = null;
+  rootElem = null;
+  Xinha.freeLater(this,'rootElem');
 };
 

branches/ray/plugins/Linker/linker.js

@@ -394 +394 @@
   ddTree.style.backgroundColor = 'white';
   this.ddTree = ddTree;
+  
   this.dTree._linker_premade = this.dTree.toString();
 
@@ -415 +416 @@
       if (h<0) h = 0;
       //options.style.height =
-       ddTree.style.height = h + 'px';
-      ddTree.style.width  = w + 'px';
+      lDialog.ddTree.style.height = h + 'px';
+      lDialog.ddTree.style.width  = w + 'px';
     }
   this.ready = true;
+  ddTree = null;
+  Xinha.freeLater(lDialog, 'ddTree');
+  options = null;
 };
 

branches/ray/plugins/SmartReplace/smart-replace.js

@@ -303 +303 @@
   // Now we have everything we need, so we can build the dialog.
   this.dialog = new Xinha.Dialog(editor, this.html, 'SmartReplace',{width:300});
-
   this.ready = true;
 };