Changeset 957

Timestamp:

02/01/08 22:44:49 (5 years ago)

Author:

ray

Message:

copied changes from branch 0.95_stable

Location:

trunk

Files:

• XinhaCore.js (modified) (14 diffs)
• XinhaLoader.js (modified) (1 diff)
• modules/Gecko/Gecko.js (modified) (1 diff)
• plugins/Equation/equation.js (modified) (8 diffs)
• plugins/ExtendedFileManager/Classes/ExtendedFileManager.php (modified) (1 diff)
• plugins/ExtendedFileManager/assets/manager.js (modified) (1 diff)

trunk/XinhaCore.js

@@ -22 +22 @@
     --        bar();
     --      }
-    --   * Don't change brace styles unless you're working on the non BSD-Style
-    --     area (so we don't get spurious changes in line numbering).
-    --   * Don't change indentation unless you're working on the badly indented
-    --     area (so we don't get spurious changes of large blocks of code).
+    --   * Don't change brace styles.
+    --   * Don't change indentation.
     --   * Jedit is the recommended editor, a comment of this format should be
     --     included in the top 10 lines of the file (see the embedded edit mode)
@@ -2431 +2429 @@
   
   this.notifyOf('before_resize', {width:width, height:height});
+  this.firePluginEvent('onBeforeResize', width, height);
   // We need to set the iframe & textarea to 100% height so that the htmlarea
   // isn't "pushed out" when we get it's height, so we can change them later.
@@ -2619 +2618 @@
      
   this.notifyOf('resize', {width:this._htmlArea.offsetWidth, height:this._htmlArea.offsetHeight});
+  this.firePluginEvent('onResize',this._htmlArea.offsetWidth, this._htmlArea.offsetWidth);
   this._risizing = false;
 };
@@ -2657 +2657 @@
 
   this.notifyOf('panel_change', {'action':'add','panel':div});
-
+  this.firePluginEvent('onPanelChange','add',div);
   return div;
 };
@@ -2676 +2676 @@
   this._panels[panel.side].panels = clean;
   this.notifyOf('panel_change', {'action':'remove','panel':panel});
+  this.firePluginEvent('onPanelChange','remove',panel);
 };
 /** Hides a panel
@@ -2687 +2688 @@
     panel.style.display = 'none';
     this.notifyOf('panel_change', {'action':'hide','panel':panel});
+    this.firePluginEvent('onPanelChange','hide',panel);
     try { this._iframe.contentWindow.scrollTo(pos.x,pos.y)} catch(e) { }
   }
@@ -2700 +2702 @@
     panel.style.display = '';
     this.notifyOf('panel_change', {'action':'show','panel':panel});
+    this.firePluginEvent('onPanelChange','show',panel);
     try { this._iframe.contentWindow.scrollTo(pos.x,pos.y)} catch(e) { }
   }
@@ -2723 +2726 @@
   }
   this.notifyOf('panel_change', {'action':'multi_hide','sides':sides});
+  this.firePluginEvent('onPanelChange','multi_hide',sides);
 };
 /** Shows the panel(s) on one or more sides
@@ -2744 +2748 @@
   }
   this.notifyOf('panel_change', {'action':'multi_show','sides':sides});
+  this.firePluginEvent('onPanelChange','multi_show',sides);
 };
 /** Returns an array containig all properties that are set in an object
@@ -3013 +3018 @@
   {
     case "textmode":
+      this.firePluginEvent('onBeforeMode', 'textmode');
       this.setCC("iframe");
       html = this.outwardHtml(this.getHTML());
@@ -3027 +3033 @@
         this._statusBarTextMode.style.display = "";
       }
+      this.findCC("textarea");
       this.notifyOf('modechange', {'mode':'text'});
-      this.findCC("textarea"); 
+      this.firePluginEvent('onMode', 'textmode');
     break;
 
     case "wysiwyg":
+      this.firePluginEvent('onBeforeMode', 'wysiwyg');
       this.setCC("textarea");
       html = this.inwardHtml(this.getHTML());
@@ -3044 +3052 @@
         this._statusBarTextMode.style.display = "none";
       }
+      this.findCC("iframe");
       this.notifyOf('modechange', {'mode':'wysiwyg'});
-      this.findCC("iframe");
+      this.firePluginEvent('onMode', 'wysiwyg');
+
     break;
 
@@ -3053 +3063 @@
   }
   this._editMode = mode;
-
-  for ( var i in this.plugins )
-  {
-    var plugin = this.plugins[i].instance;
-    if ( plugin && typeof plugin.onMode == "function" )
-    {
-      plugin.onMode(mode);
-    }
-  }
 };
 /** Sets the HTML in fullpage mode. Actually the whole iframe document is rewritten.
@@ -4152 +4153 @@
     this._timerUndo = setTimeout(function() { editor._timerUndo = null; }, this.config.undoTimeout);
   }
-
-  // Insert a space in certain locations, this is just to make editing a little
-  // easier (to "get out of" tags), it's not essential.
-  // TODO: Make this work for IE?
-  // TODO: Perhaps should use a plain space character, I'm not sure.
-  //  OK, I've disabled this temporarily, to be honest, I can't rightly remember what the
-  //  original problem was I was trying to solve with it.  I think perhaps that EnterParagraphs
-  //  might solve the problem, whatever the hell it was.  I'm going senile, I'm sure.
-  // @todo : since this part is disabled since a long time, does it still need to be in the source ?
-  if( 0 && Xinha.is_gecko )
-  {
-    var s = this.getSelection();
-    // If the last character in the last text node of the parent tag
-    // and the parent tag is not a block tag
-    if ( s && s.isCollapsed && s.anchorNode &&
-         s.anchorNode.parentNode.tagName.toLowerCase() != 'body' &&
-         s.anchorNode.nodeType == 3 && s.anchorOffset == s.anchorNode.length &&
-         !( s.anchorNode.parentNode.nextSibling && s.anchorNode.parentNode.nextSibling.nodeType == 3 ) &&
-         !Xinha.isBlockElement(s.anchorNode.parentNode) )
-    {
-      // Insert hair-width-space after the close tag if there isn't another text node on the other side
-      // It could also work with zero-width-space (\u200B) but I don't like it so much.
-      // Perhaps this won't work well in various character sets and we should use plain space (20)?
-      try
-      {
-        s.anchorNode.parentNode.parentNode.insertBefore(this._doc.createTextNode('\t'), s.anchorNode.parentNode.nextSibling);
-      }
-      catch(ex) {} // Disregard
-    }
-  }
-
-  // FIXME: this should be using this.firePluginEvent('onUpdateToolbar')
-  //   but we have to make sure that the plugins using that event return false
-  //   if they should let the event fire on other plugins, currently the below
-  //   code doesn't take the return value into account
-  
-  // check if any plugins have registered refresh handlers
-  for ( var indexPlugin in this.plugins )
-  {
-    var plugin = this.plugins[indexPlugin].instance;
-    if ( plugin && typeof plugin.onUpdateToolbar == "function" )
-    {
-      plugin.onUpdateToolbar();
-    }
-  }
-
+  this.firePluginEvent('onUpdateToolbar');
 };
 

trunk/XinhaLoader.js

@@ -1 +1 @@
 var Xinha = {};
+
+_editor_url = _editor_url.replace(/\x2f*$/, '/');
+
 Xinha.agt       = navigator.userAgent.toLowerCase();
 Xinha.is_ie    = ((Xinha.agt.indexOf("msie") != -1) && (Xinha.agt.indexOf("opera") == -1));

trunk/modules/Gecko/Gecko.js

@@ -696 +696 @@
 
 //Control character for retaining edit location when switching modes
-Xinha.prototype.cc = '|XinhaCaret|'; 
+Xinha.prototype.cc = String.fromCharCode(8286); 
 
 Xinha.prototype.setCC = function ( target )

trunk/plugins/Equation/equation.js

@@ -47 +47 @@
         mathfontfamily = cfg.Equation.mathfontfamily;
         
-        //if (Xinha.is_ie) return;
-        if (!Xinha.is_ie)
+        this.enabled = !Xinha.is_ie;
+        
+        if (this.enabled)
         {       
-                editor.notifyOn( 'modechange',
-                        function( e, args )
-                                {
-                                        self.onModeChange( args );
-                                }
-                        );
                 this.onBeforeSubmit = this.onBeforeUnload = function () {self.unParse();};
         }
@@ -91 +86 @@
         this.parse();
 };
-Equation.prototype.onUpdateToolbar = function() 
-{
-        var e = this.editor;
-        if (!Xinha.is_ie && this.reParse)
-        {
-                AMprocessNode(e._doc.body, false);
-                this.reParse = false;
-        }
-};
+
 // avoid changing the formula in the editor
 Equation.prototype.onKeyPress = function(ev)
 {
-        if (!Xinha.is_ie)
+        if (this.enabled)
         {
                 e = this.editor;
@@ -122 +109 @@
         return false;
 }
-Equation.prototype.onModeChange = function( args )
-{
-        var doc = this.editor._doc;
-        switch (args.mode)
-        {
-                case 'text':
-                        this.unParse();
-                break;
-                case 'wysiwyg':
-                        this.parse();
-                break;
-        }
-};
+Equation.prototype.onBeforeMode = function( mode )
+{
+        if (this.enabled && mode == 'textmode')
+        {
+                this.unParse();
+        }
+}
+Equation.prototype.onMode = function( mode )
+{
+        if (this.enabled && mode == 'wysiwyg')
+        {
+                this.parse();
+        }
+}
 
 Equation.prototype.parse = function ()
 {
-        if (!Xinha.is_ie)
+        if (this.enabled)
         {
                 var doc = this.editor._doc;
@@ -163 +151 @@
                         } catch (e) {}
                         node.parentNode.replaceChild(clone, node);
+                        // insert space before and after the protected node, otherwide one could get stuck
+                        clone.parentNode.insertBefore(doc.createTextNode(String.fromCharCode(32)),clone);
+                        clone.parentNode.insertBefore(doc.createTextNode(String.fromCharCode(32)),clone.nextSibling);
                 }
         }
@@ -178 +169 @@
                 node.innerHTML = formula;
                 node.setAttribute("title", null);
-                this.editor.setHTML(this.editor.getHTML());
         }
 }
@@ -212 +202 @@
                         {
                                 span.innerHTML = formula;
-                                if (!Xinha.is_ie) span.title = formula;
+                                if (this.enabled) span.title = formula;
                         }
                         else
@@ -222 +212 @@
                 else if (!param["editedNode"] && formula != '')
                 {
-                        if (!Xinha.is_ie)
+                        if (this.enabled)
                         {                       
                                 var span = document.createElement('span');
@@ -236 +226 @@
                 }
 
-                if (!Xinha.is_ie) this.parse();//AMprocessNode(this.editor._doc.body, false);
-        }
-}
+                if (this.enabled) this.parse();//AMprocessNode(this.editor._doc.body, false);
+        }
+}

trunk/plugins/ExtendedFileManager/Classes/ExtendedFileManager.php

@@ -810 +810 @@
                         break;
                         case 'moveFile':
-                                $src = Files::makePath($this->getImagesDir(), $_GET['srcdir'].$_GET['file']);
-                                $dest = Files::makePath($this->getImagesDir(), $_GET['dir'].$_GET['file']);
+                                $src = Files::makeFile($this->getImagesDir(), $_GET['srcdir'].$_GET['file']);
+                                $dest = Files::makeFile($this->getImagesDir(), $_GET['dir'].$_GET['file']);
                                 return Files::rename($src,$dest);
                         break;

trunk/plugins/ExtendedFileManager/assets/manager.js

@@ -66 +66 @@
         window.resizeBy(0, page.y - dim.y + 5);
 
+        dim = Xinha.viewportSize(window);
+        
         if (!Xinha.is_ie)
         {
-          var x = opener.screenX + (opener.outerWidth - w) / 2;
-          var y = opener.screenY + (opener.outerHeight -h) / 2;
+          var x = opener.screenX + (opener.outerWidth - dim.x) / 2;
+          var y = opener.screenY + (opener.outerHeight - dim.x) / 2;
         }
         else
         {//IE does not have window.outer... , so center it on the screen at least
-          var x =  (self.screen.availWidth -w) / 2;
-          var y =  (self.screen.availHeight - h) / 2;   
+          var x =  (self.screen.availWidth - dim.x) / 2;
+          var y =  (self.screen.availHeight - dim.y) / 2;       
         }
         window.moveTo(x,y);