Changeset 796

Timestamp:

03/23/07 20:31:32 (6 years ago)

Author:

ray

Message:

updated branch

Location:

branches/ray

Files:

• XinhaCore.js (modified) (4 diffs)
• examples/testbed.html (modified) (4 diffs)
• modules/ColorPicker/ColorPicker.js (modified) (1 diff)
• modules/Gecko/Gecko.js (modified) (2 diffs)
• modules/InternetExplorer/InternetExplorer.js (modified) (2 diffs)
• plugins/ExtendedFileManager/assets/EditorContent.js (modified) (1 diff)
• plugins/ImageManager/assets/EditorContent.js (modified) (1 diff)
• plugins/Stylist/stylist.js (modified) (2 diffs)

branches/ray/XinhaCore.js

@@ -4179 +4179 @@
   html = html.replace(/<(\/?)strike(\s|>|\/)/ig, "<$1del$2");
   
-  // replace window.open to that any clicks won't open a popup in designMode
-  html = html.replace("onclick=\"try{if(document.designMode &amp;&amp; document.designMode == 'on') return false;}catch(e){} window.open(", "onclick=\"window.open(");
+  // remove disabling of inline event handle inside Xinha iframe
+  html = html.replace(/(<[^>]*onclick=['"])if\(window\.top &amp;&amp; window\.top\.Xinha\)\{return false\}/gi,'$1');
+  html = html.replace(/(<[^>]*onmouseover=['"])if\(window\.top &amp;&amp; window\.top\.Xinha\)\{return false\}/gi,'$1');
+  html = html.replace(/(<[^>]*onmouseout=['"])if\(window\.top &amp;&amp; window\.top\.Xinha\)\{return false\}/gi,'$1');
+  html = html.replace(/(<[^>]*onmousedown=['"])if\(window\.top &amp;&amp; window\.top\.Xinha\)\{return false\}/gi,'$1');
+  html = html.replace(/(<[^>]*onmouseup=['"])if\(window\.top &amp;&amp; window\.top\.Xinha\)\{return false\}/gi,'$1');
 
   // Figure out what our server name is, and how it's referenced
@@ -4231 +4235 @@
   html = html.replace(/<(\/?)del(\s|>|\/)/ig, "<$1strike$2");
 
-  // replace window.open to that any clicks won't open a popup in designMode
-  html = html.replace("onclick=\"window.open(", "onclick=\"try{if(document.designMode &amp;&amp; document.designMode == 'on') return false;}catch(e){} window.open(");
-
+  // disable inline event handle inside Xinha iframe
+  html = html.replace(/(<[^>]*onclick=["'])/gi,'$1if(window.top &amp;&amp; window.top.Xinha){return false}');
+  html = html.replace(/(<[^>]*onmouseover=["'])/gi,'$1if(window.top &amp;&amp; window.top.Xinha){return false}');
+  html = html.replace(/(<[^>]*onmouseout=["'])/gi,'$1if(window.top &amp;&amp; window.top.Xinha){return false}');
+  html = html.replace(/(<[^>]*onmouseodown=["'])/gi,'$1if(window.top &amp;&amp; window.top.Xinha){return false}');
+  html = html.replace(/(<[^>]*onmouseup=["'])/gi,'$1if(window.top &amp;&amp; window.top.Xinha){return false}');
+  
   html = this.inwardSpecialReplacements(html);
 
@@ -5377 +5385 @@
  */
  
-Xinha._loadback = function(Url, Callback, Scope, Bonus)
+Xinha._loadback = function(url, callback, scope, bonus)
 {  
-  var T = !Xinha.is_ie ? "onload" : 'onreadystatechange';
-  var S = document.createElement("script");
-  S.type = "text/javascript";
-  S.src = Url;
-  S.id = Url;
-  if ( Callback )
-  {
-    S[T] = function()
+  if ( document.getElementById(url) )
+  {
+    return true;
+  }
+  var t = !Xinha.is_ie ? "onload" : 'onreadystatechange';
+  var s = document.createElement("script");
+  s.type = "text/javascript";
+  s.src = url;
+  s.id = url;
+  if ( callback )
+  {
+    s[t] = function()
     {      
       if ( Xinha.is_ie && ( ! ( /loaded|complete/.test(window.event.srcElement.readyState) ) ) )
@@ -5393 +5405 @@
       }
       
-      Callback.call(Scope ? Scope : this, Bonus);
-      S[T] = null;
+      callback.call(scope ? scope : this, bonus);
+      s[t] = null;
     };
   }
-  document.getElementsByTagName("head")[0].appendChild(S);
+  document.getElementsByTagName("head")[0].appendChild(s);
+  return false;
 };
 

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 = "de";      // And the language we need to use in the editor.
+    _editor_lang = "en";      // And the language we need to use in the editor.
   </script>
 
@@ -63 +63 @@
        [
          'CharacterMap', 
-        // 'Linker',
-        // 'Stylist',
-        // 'SmartReplace'
+         'Linker',
+         'Stylist',
+         'SmartReplace'
        ];
              // THIS BIT OF JAVASCRIPT LOADS THE PLUGINS, NO TOUCHING  :)
@@ -85 +85 @@
        xinha_config = xinha_config ? xinha_config : new Xinha.Config();
    
-       //  xinha_config.stylistLoadStylesheet(document.location.href.replace(/[^\/]*\.html/, 'stylist.css'));
+        xinha_config.stylistLoadStylesheet(document.location.href.replace(/[^\/]*\.html/, 'stylist.css'));
          
       //xinha_config.CharacterMap.mode = 'panel';
@@ -148 +148 @@
 <body>
 
-  <form action="test_dest.php" id="editors_here" onsubmit="alert(this.myTextArea.value);">
-<input type="checkbox" name="hallo" />
-<select>
-<option>Test</option>
-</select>
+  <form action="" id="editors_here" onsubmit="alert(this.myTextArea.value);">
 <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />
   <textarea id="myTextArea" name="myTextArea" style="width:100%;height:300px;">
     <table cellspacing="1" cellpadding="1" border="1" style="width: 100%;"><tbody><tr><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td></tr><tr><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td></tr></tbody></table><br /></textarea>
 
-    <input type="submit" /> <input type="reset" /><input type="checkbox" name="hallo" />
-<select>
-<option>Test</option>
-</select>
-  <textarea name="myTextArea" style="width:100%;height:320px;">
-    <table cellspacing="1" cellpadding="1" border="1" style="width: 100%;"><tbody><tr><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td></tr><tr><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td></tr></tbody></table><br /></textarea>
-
-    <input type="submit" /> <input type="reset" />
+<br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />
   </form>
   <script language="javascript">

branches/ray/modules/ColorPicker/ColorPicker.js

@@ -366 +366 @@
         if (e.style.position == 'fixed') 
         {
-          this.table.style.position = 'absolute';
+          this.table.style.position = 'fixed';
         }
         top += e.offsetTop;

branches/ray/modules/Gecko/Gecko.js

@@ -528 +528 @@
 };
 
-
+/** 
+ * Returns a range object to be stored 
+ * and later restored with Xinha.prototype.restoreSelection()
+ * 
+ * @returns Range
+ */
+Xinha.prototype.saveSelection = function()
+{
+  return this.createRange(this.getSelection()).cloneRange();
+}
+/** 
+ * Restores a selection previously stored
+ * @param savedSelection Range object as returned by Xinha.prototype.restoreSelection()
+ */
+Xinha.prototype.restoreSelection = function(savedSelection)
+{
+  var sel = this.getSelection();
+  sel.removeAllRanges();
+  sel.addRange(savedSelection);
+}
 /**
  * Selects the contents of the given node.  If the node is a "control" type element, (image, form input, table)
@@ -758 +777 @@
   return d;
 };
-
-Xinha.prototype.saveSelection = function()
-{
-  return this.createRange(this.getSelection()).cloneRange();
-}
-Xinha.prototype.restoreSelection = function(savedSelection)
-{
-  var sel = this.getSelection();
-  sel.removeAllRanges();
-  sel.addRange(savedSelection);
-}

branches/ray/modules/InternetExplorer/InternetExplorer.js

@@ -279 +279 @@
 };
 
+/** 
+ * Returns a range object to be stored 
+ * and later restored with Xinha.prototype.restoreSelection()
+ * 
+ * @returns Range
+ */
+Xinha.prototype.saveSelection = function()
+{
+  return this.createRange(this._getSelection())
+}
+/** 
+ * Restores a selection previously stored
+ * @param savedSelection Range object as returned by Xinha.prototype.restoreSelection()
+ */
+Xinha.prototype.restoreSelection = function(savedSelection)
+{
+  savedSelection.select();
+}
 /**
  * Selects the contents of the given node.  If the node is a "control" type element, (image, form input, table)
@@ -469 +487 @@
   return (doc.compatMode == "CSS1Compat") ? '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">' : '';
 };
-
-Xinha.prototype.saveSelection = function()
-{
-  return this.createRange(this._getSelection())
-}
-Xinha.prototype.restoreSelection = function(savedSelection)
-{
-  savedSelection.select();
-}

branches/ray/plugins/ExtendedFileManager/assets/EditorContent.js

@@ -482 +482 @@
 function setMarker(nx,ny,nw,nh)
 {
+    if (isNaN(nx)) nx = 0; 
+    if (isNaN(ny)) ny = 0; 
+    if (isNaN(nw)) nw = 0; 
+    if (isNaN(nh)) nh = 0; 
+
     if (ant == null)
         ant = MM_findObj("ant");

branches/ray/plugins/ImageManager/assets/EditorContent.js

@@ -488 +488 @@
 function setMarker(nx,ny,nw,nh) 
 {
+    if (isNaN(nx)) nx = 0;
+    if (isNaN(ny)) ny = 0;
+    if (isNaN(nw)) nw = 0;
+    if (isNaN(nh)) nh = 0;
+  
     if (ant == null)
-        ant = MM_findObj("ant");
+      ant = MM_findObj("ant");
 
     if (canvas == null)

branches/ray/plugins/Stylist/stylist.js

@@ -713 +713 @@
 Xinha.ripStylesFromCSSFile = function(URL)
 {
+  Xinha.setLoadingMessage('Loading Styles');
   var css = Xinha._geturlcontent(URL);
   return Xinha.ripStylesFromCSSString(css);
@@ -782 +783 @@
   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();