Changeset 1057

Timestamp:

10/04/08 06:54:52 (2 months ago)

Author:

ray

Message:

fixed some unnecessarily global variables

Location:

trunk

Files:

• XinhaCore.js (modified) (5 diffs)
• XinhaLoader.js (modified) (1 diff)
• modules/Dialogs/XinhaDialog.js (modified) (2 diffs)
• modules/FullScreen/full-screen.js (modified) (2 diffs)
• plugins/ExtendedFileManager/assets/dragTableCols.js (modified) (1 diff)
• plugins/Stylist/stylist.js (modified) (1 diff)

trunk/XinhaCore.js

@@ -77 +77 @@
   // convert _editor_url to absolute
   if(!_editor_url.match(/^([^:]+\:)?\//)){
-    var path = window.location.toString().replace(/\?.*$/,'').split("/");
-    path.pop();
-    _editor_url = Xinha._resolveRelativeUrl(path.join("/"), _editor_url);
+    Xinha.tmpPath = window.location.toString().replace(/\?.*$/,'').split("/");
+    Xinha.tmpPath.pop();
+    _editor_url = Xinha._resolveRelativeUrl(Xinha.tmpPath.join("/"), _editor_url);
+    delete(Xinha.tmpPath);  
   }
 }
@@ -1901 +1902 @@
 };
 
-// @todo : is this some kind of test not finished ?
-//         Why the hell this is not in the config object ?
-var use_clone_img = false;
 /** creates a button (i.e. container element + image)
  * @private
@@ -1950 +1948 @@
       img.style.width = "18px";
       img.style.height = "18px";
-      if ( use_clone_img )
-      {
-        doc._xinhaImgCache[imgDef] = img.cloneNode();
-      }
     }
   }
@@ -1967 +1961 @@
       img.src = imgDef[0];
       img.style.position = 'relative';
-      if ( use_clone_img )
-      {
-        doc._xinhaImgCache[imgDef[0]] = img.cloneNode();
-      }
     }
     // @todo: Using 18 dont let us use a theme with its own icon toolbar height
@@ -6886 +6876 @@
 Xinha.getElementTopLeft = function(element) 
 {
-  var curleft = curtop = 0;
+  var curleft = 0;
+  var curtop =  0;
   if (element.offsetParent) 
   {

trunk/XinhaLoader.js

@@ -58 +58 @@
 Xinha.getElementTopLeft = function(element) 
 {
-  var curleft = curtop = 0;
+  var curleft = 0;
+  var curtop = 0;
   if (element.offsetParent) 
   {

trunk/modules/Dialogs/XinhaDialog.js

@@ -50 +50 @@
     undefined, the options passed in above will be used.
   */
-  globalOptions = editor.config.dialogOptions
+  var globalOptions = editor.config.dialogOptions
   if (globalOptions) {
     if (typeof(globalOptions.centered) != 'undefined') {
@@ -271 +271 @@
   rootElem = null;
   main = null;
-  resizeHandle = null;
   
   Xinha.freeLater(this,"rootElem");

trunk/modules/FullScreen/full-screen.js

@@ -3 +3 @@
   this.editor = editor;
   editor._superclean_on = false;
-  cfg = editor.config;
+  var cfg = editor.config;
 
   cfg.registerButton
@@ -44 +44 @@
 {
   var e = this;
+  var cfg = e.config;
   function sizeItUp()
   {

trunk/plugins/ExtendedFileManager/assets/dragTableCols.js

@@ -102 +102 @@
 dragTableCols.getElementTopLeft = function(element) 
 {
-  var curleft = curtop = 0;
+  var curleft = 0;
+  var curtop = 0;
   if (element.offsetParent) 
   {

trunk/plugins/Stylist/stylist.js

@@ -482 +482 @@
   // We are only interested in the selectors, the rules are not important
   //  so we'll drop out all coments and rules
-  RE_comment = /\/\*(.|\r|\n)*?\*\//g;
-  RE_rule    = /\{(.|\r|\n)*?\}/g;
+  var RE_comment = /\/\*(.|\r|\n)*?\*\//g;
+  var RE_rule    = /\{(.|\r|\n)*?\}/g;
   css = css.replace(RE_comment, '');
   css = css.replace(RE_rule, ',');