Changeset 890

Timestamp:

09/13/07 14:52:14 (12 years ago)

Author:

ray

Message:

update branch

Location:

branches/ray

Files:

• XinhaCore.js (modified) (4 diffs)
• XinhaLoader.js (modified) (2 diffs)
• examples/testbed.html (modified) (2 diffs)
• modules/Dialogs/XinhaDialog.js (modified) (5 diffs)
• modules/GetHtml/DOMwalk.js (modified) (2 diffs)
• modules/InternetExplorer/InternetExplorer.js (modified) (1 diff)
• plugins/HtmlEntities (added)
• plugins/HtmlEntities/Entities.js (added)
• plugins/HtmlEntities/html-entities.js (added)
• plugins/HtmlEntities/iso-8859-1.js (added)
• plugins/InsertSnippet (added)
• plugins/InsertSnippet/InsertSnippet.css (added)
• plugins/InsertSnippet/dialog.html (added)
• plugins/InsertSnippet/img (added)
• plugins/InsertSnippet/img/1.PNG (added)
• plugins/InsertSnippet/img/10.PNG (added)
• plugins/InsertSnippet/img/11.PNG (added)
• plugins/InsertSnippet/img/12.PNG (added)
• plugins/InsertSnippet/img/13.PNG (added)
• plugins/InsertSnippet/img/14.PNG (added)
• plugins/InsertSnippet/img/15.PNG (added)
• plugins/InsertSnippet/img/16.PNG (added)
• plugins/InsertSnippet/img/2.PNG (added)
• plugins/InsertSnippet/img/3.PNG (added)
• plugins/InsertSnippet/img/4.PNG (added)
• plugins/InsertSnippet/img/5.PNG (added)
• plugins/InsertSnippet/img/6.PNG (added)
• plugins/InsertSnippet/img/7.PNG (added)
• plugins/InsertSnippet/img/8.PNG (added)
• plugins/InsertSnippet/img/9.PNG (added)
• plugins/InsertSnippet/img/ed_snippet.gif (added)
• plugins/InsertSnippet/insert-snippet.js (added)
• plugins/InsertSnippet/lang (added)
• plugins/InsertSnippet/lang/de.js (added)
• plugins/InsertSnippet/snippets.php (added)
• plugins/InsertSnippet/snippets.xml (added)
• plugins/SaveSubmit/save-submit.js (modified) (3 diffs)
• plugins/Stylist/pluginMethods.js (deleted)
• plugins/Stylist/stylist.js (modified) (1 diff)

branches/ray/XinhaCore.js

@@ -2847 +2847 @@
   {
     this._doc.body.contentEditable = true;
-
-    if (this._iframe.contentWindow.event.srcElement.tagName.toLowerCase() == 'html') // if  clicked below the text (=body), the text cursor does not appear, see #1019 
-    {
-      var r = this._doc.body.createTextRange();
-      setTimeout (function () { r.collapse();  r.select();},100); // won't do without timeout, dunno why
-    }
   }
 
@@ -3141 +3135 @@
 {
   var editor=this;
-  var doc = (Xinha.is_ie) ? this._doc.getElementsByTagName("html")[0] : this._doc; // #1019 Cusor not jumping to editable part of window when clicked in IE, see also #1039
+  var doc = this._doc;
 
   editor.whenDocReady(
@@ -3156 +3150 @@
         }
       );
+      if (Xinha.is_ie)
+      { // #1019 Cusor not jumping to editable part of window when clicked in IE, see also #1039
+        Xinha._addEvent(
+        editor._doc.getElementsByTagName("html")[0],
+        "click",
+          function()
+          {
+            if (editor._iframe.contentWindow.event.srcElement.tagName.toLowerCase() == 'html') // if  clicked below the text (=body), the text cursor does not appear, see #1019
+            {
+               var r = editor._doc.body.createTextRange();
+               r.collapse();  
+               r.select()
+               //setTimeout (function () { r.collapse();  r.select();},100); // won't do without timeout, dunno why
+             }
+             return true;
+          }
+        );
+      }
 
       // intercept some events; for updating the toolbar & keyboard handlers
@@ -3317 +3329 @@
 {
   if ( !Xinha.isSupportedBrowser ) return;
-  
+  Xinha.setLoadingMessage (Xinha._lc("Loading plugins"));
   // Rip the ones that are loaded and look for ones that have failed
   var retVal = true;

branches/ray/XinhaLoader.js

@@ -7 +7 @@
 Xinha.is_safari  = (Xinha.agt.indexOf("safari") != -1);
 Xinha.opera_version = navigator.appVersion.substring(0, navigator.appVersion.indexOf(" "))*1;
-Xinha.is_mac       = (Xinha.agt.indexOf("mac") != -1);
+Xinha.is_mac   = (Xinha.agt.indexOf("mac") != -1);
 Xinha.is_mac_ie = (Xinha.is_ie && Xinha.is_mac);
 Xinha.is_win_ie = (Xinha.is_ie && !Xinha.is_mac);
@@ -158 +158 @@
 };
 Xinha._lc = function(string) {return string;}
+
+Xinha._addEvent = function(el, evname, func) 
+{
+  if ( document.addEventListener )
+  {
+    el.addEventListener(evname, func, true);
+  }
+  else
+  {
+    el.attachEvent("on" + evname, func);
+  }
+}

branches/ray/examples/testbed.html

@@ -30 +30 @@
     // in this example we do a little regular expression to find the absolute path.
     _editor_url  = document.location.href.replace(/examples\/.*/, '')
-    _editor_lang = "en";      // And the language we need to use in the editor.
+    _editor_lang = "de";      // And the language we need to use in the editor.
   </script>
 
@@ -65 +65 @@
          'Linker',
          'Stylist',
-         'SmartReplace'
+         'SmartReplace',
+                 'InsertSnippet'
        ];
              // THIS BIT OF JAVASCRIPT LOADS THE PLUGINS, NO TOUCHING  :)

branches/ray/modules/Dialogs/XinhaDialog.js

@@ -280 +280 @@
     //Xinha._addEvent(window, 'resize', this.onResizeWin );
 
-    rootElemStyle.display   = '';
-
+    //rootElemStyle.display   = '';
+Xinha.Dialog.fadeIn(this.rootElem);
     var dialogHeight = rootElem.offsetHeight;
     var dialogWidth = rootElem.offsetWidth;
@@ -367 +367 @@
   else
   {
-    this.rootElem.style.display = 'none';
-    this.hideBackground();
+    //this.rootElem.style.display = 'none';
+    Xinha.Dialog.fadeOut(this.rootElem);
+        this.hideBackground();
     var dialog = this;
 
@@ -393 +394 @@
     }
   }
-    // Restore the selection
+   // Restore the selection --> should this happen only with modals?
   this.editor.restoreSelection(this._lastRange);
   
@@ -654 +655 @@
 Xinha.Dialog.prototype.hideBackground = function()
 {
-  this.background.style.display = 'none';
+  //this.background.style.display = 'none';
+  Xinha.Dialog.fadeOut(this.background);
 }
 Xinha.Dialog.prototype.showBackground = function()
 {
-  this.background.style.display = '';
+  //this.background.style.display = '';
+  Xinha.Dialog.fadeIn(this.background,70);
 }
 Xinha.Dialog.prototype.posBackground = function(pos)
@@ -945 +948 @@
   Xinha.Dialog.activeModeless.rootElem.style.zIndex = parseInt(Xinha.Dialog.activeModeless.rootElem.style.zIndex) + 10;
 }
+Xinha.Dialog.setOpacity = function(el,value)
+{
+        if (typeof el.style.filter != 'undefined')
+        {
+                el.style.filter = (value < 100) ?  'alpha(opacity='+value+')' : '';
+        }
+        else
+        {
+                el.style.opacity = value/100;
+        }
+}
+Xinha.Dialog.fadeIn = function(el,endOpacity,delay,step)
+{
+        delay = delay || 1;
+        step = step || 25;
+        endOpacity = endOpacity || 100;
+        el.op = el.op || 0;
+        var op = el.op;
+        if (el.style.display == 'none')
+        {
+                Xinha.Dialog.setOpacity(el,0);
+                el.style.display = '';
+        }
+        if (op < endOpacity)
+        {
+                el.op += step;
+                Xinha.Dialog.setOpacity(el,op);
+                el.timeOut = setTimeout(function(){Xinha.Dialog.fadeIn(el,endOpacity,delay,step);},delay);
+        }
+        else
+        {
+                Xinha.Dialog.setOpacity(el,endOpacity);
+                el.op = endOpacity;
+                el.timeOut = null;
+        }
+}
+
+Xinha.Dialog.fadeOut = function(el,delay,step)
+{
+        delay = delay || 1;
+        step = step || 30;
+        if (typeof el.op == 'undefined') el.op = 100;
+        var op = el.op;
+
+        if (op >= 0)
+        {
+                el.op -= step;
+                Xinha.Dialog.setOpacity(el,op);
+                el.timeOut = setTimeout(function(){Xinha.Dialog.fadeOut(el,delay,step);},delay);
+        }
+        else
+        {
+                Xinha.Dialog.setOpacity(el,0);
+                el.style.display = 'none';
+                el.op = 0;
+                el.timeOut = null;
+        }
+}
+
+

branches/ray/modules/GetHtml/DOMwalk.js

@@ -52 +52 @@
 };
 
-Xinha.emptyAttributes = " checked disabled ismap readonly nowrap compact declare selected defer multiple noresize noshade ";
-Xinha.elGetsNewLine = function (el) { return (" br meta link title ".indexOf(" " + el.tagName.toLowerCase() + " ") != -1);};
+Xinha.emptyAttributes = " checked disabled ismap readonly nowrap compact declare selected defer multiple noresize noshade "
 
 Xinha.getHTMLWrapper = function(root, outputRoot, editor, indent)
@@ -133 +132 @@
       {
         closed = (!(root.hasChildNodes() || Xinha.needsClosingTag(root)));
-        html += ((Xinha.isBlockElement(root) || Xinha.elGetsNewLine(root)) ? ('\n' + indent) : '') + "<" + root.tagName.toLowerCase();
+        html += ((Xinha.isBlockElement(root)) ? ('\n' + indent) : '') + "<" + root.tagName.toLowerCase();
         var attrs = root.attributes;
         

branches/ray/modules/InternetExplorer/InternetExplorer.js

@@ -306 +306 @@
 Xinha.prototype.restoreSelection = function(savedSelection)
 {
-  savedSelection.select();
+  try { savedSelection.select() } catch (e) {};
 }
 

branches/ray/plugins/SaveSubmit/save-submit.js

@@ -34 +34 @@
 SaveSubmit._pluginInfo = {
   name          : "SaveSubmit",
-  version       : "1.0",
+  version       : "1.05",
   developer     : "Raimund Meyer",
   developer_url : "http://rheinauf.de",
@@ -41 +41 @@
   sponsor_url   : "",
   license       : "htmlArea"
-}
-
-SaveSubmit.prototype.onGenerateOnce = function() {
-        this.initial_html = this.editor.getInnerHTML();
 }
 
@@ -73 +69 @@
 }
 SaveSubmit.prototype.getChanged = function() {
-        if (this.initial_html === null) this.initial_html = this.editor.getInnerHTML();
+        if (!this.initial_html) this.initial_html = this.editor.getInnerHTML();
         if (this.initial_html != this.editor.getInnerHTML() && this.changed == false) {
                 this.changed = true;

branches/ray/plugins/Stylist/stylist.js

@@ -596 +596 @@
   var editor = this.editor;
   var rootElem = this.dialog.rootElem;
+  
+  if (rootElem.style.display == 'none') return;
+  
   var panelContainer = rootElem.parentNode;