Changeset 548

Timestamp:

08/07/06 13:23:07 (7 years ago)

Author:

mokhet

Message:

freeLater() is now able to use an array of properties
free more precisely the properties, instead of freeing the whole object
fix form.submit() from ticket #823
update the original content on dispose
fix window resizing from an inline fucntion i had forgot

Location:

branches/mokhet

Files:

• examples/on_demand.php (modified) (3 diffs)
• htmlarea.js (modified) (22 diffs)

branches/mokhet/examples/on_demand.php

@@ -1 +1 @@
 <?php
-$content1 = array_key_exists('ta1', $_POST) ? $_POST['ta1'] : '<p>Content ONE here</p>';
-$content2 = array_key_exists('ta2', $_POST) ? $_POST['ta2'] : '<p>Content TWO here</p>';
+$content1 = array_key_exists('ta1', $_POST) ? stripslashes($_POST['ta1']) : '<p>Content ONE here</p>';
+$content2 = array_key_exists('ta2', $_POST) ? stripslashes($_POST['ta2']) : '<p>Content TWO here</p>';
 // Entitize contents
 // Please referer to http://xinha.python-hosting.com/wiki/Entize
@@ -143 +143 @@
 padding:2px;
 }
-#resultcontent
+#resultcontent, .fromPOST
 {
 border:1px solid black;
@@ -212 +212 @@
 
 </form>
-<div id="resultcontent"></div>
+<div id="resultcontent">
+<?php
+if ( array_key_exists('ta1', $_POST) )
+{
+  echo '<div class="fromPOST">'.stripslashes($_POST['ta1']).'</div>';
+}
+if ( array_key_exists('ta2', $_POST) )
+{
+  echo '<div class="fromPOST">'.stripslashes($_POST['ta2']).'</div>';
+}
+?>
+</div>
 </body>
 </html>

branches/mokhet/htmlarea.js

@@ -169 +169 @@
     this.toFree = [];
     this._notifyListeners = {};
-    this.freeLater(this, '_notifyListeners');
 
     // Panels
@@ -205 +204 @@
       panels[i].div = panels[i].container; // legacy
       panels[i].container.className = 'panels ' + i;
-      this.freeLater(panels[i], 'container');
-      this.freeLater(panels[i], 'div');
+      this.freeLater(panels[i], ['container', 'div']);
     }
     // finally store the variable
     this._panels = panels;
 
-    this.freeLater(this, '_textArea');
+    this.freeLater(this, ['_textArea', '_notifyListeners']);
   }
 }
@@ -881 +879 @@
   toolbar.unselectable = "1";
 
-  this.freeLater(this, '_toolBar');
-  this.freeLater(this, '_toolbar');
+  this.freeLater(this, ['_toolBar', '_toolbar']);
 
   var tb_row = null;
@@ -1065 +1062 @@
       };
       
-      editor.freeLater(obj);
+//      editor.freeLater(obj);
+      editor.freeLater(obj, ['element', 'state']);
 
       tb_objects[txt] = obj;
@@ -1126 +1124 @@
         };
       
-        editor.freeLater(obj);
+//        editor.freeLater(obj);
+        editor.freeLater(obj, ['element', 'state']);
 
         tb_objects[txt] = obj;
@@ -1137 +1136 @@
       el = document.createElement("a");
       el.style.display = 'block';
-      el.href = 'javascript:void(0)';
+      el.href = '#';
       el.style.textDecoration = 'none';
       el.title = btn[0];
@@ -1155 +1154 @@
         context : btn[4] || null // enabled in a certain context?
       };
-      editor.freeLater(el);
-      editor.freeLater(obj);
+//      editor.freeLater(el);
+//      editor.freeLater(obj);
+      editor.freeLater(obj, ['element', 'cmd', 'state', 'imgel', 'swapImage']);
 
       tb_objects[txt] = obj;
@@ -1162 +1162 @@
       // prevent drag&drop of the icon to content area
       el.ondrag = function() { return false; };
+      editor.freeLater(el, 'ondrag');
 
       // handlers to emulate nice flat toolbar buttons
@@ -1182 +1183 @@
           HTMLArea._addClass(el, "buttonActive");
           HTMLArea._removeClass(el, "buttonPressed");
-          HTMLArea.Events.stop(ev);
-        }
+        }
+        HTMLArea.Events.stop(ev);
       }
       // when clicked, do the following:
@@ -1197 +1198 @@
           }
           obj.cmd(editor, obj.name, obj);
-          HTMLArea.Events.stop(ev);
-        }
+        }
+        HTMLArea.Events.stop(ev);
       }
       HTMLArea.Events.add(el, 'mouseout', el_onmout);
@@ -1387 +1388 @@
   statusbar.className = "statusBar";
   this._statusBar = statusbar;
-  this.freeLater(this, '_statusBar');
   
   // statusbar.appendChild(document.createTextNode(HTMLArea._lc("Path") + ": "));
@@ -1395 +1395 @@
   div.innerHTML = HTMLArea._lc("Path") + ": ";
   this._statusBarTree = div;
-  this.freeLater(this, '_statusBarTree');
   this._statusBar.appendChild(div);
 
@@ -1402 +1401 @@
   div.style.display = "none";
   this._statusBarTextMode = div;
-  this.freeLater(this, '_statusBarTextMode');
+  this.freeLater(this, ['_statusBar', '_statusBarTree', '_statusBarTextMode']);
   this._statusBar.appendChild(div);
 
@@ -1567 +1566 @@
   var htmlarea = this._framework.table;
   this._htmlArea = htmlarea;
-  this.freeLater(this, '_htmlArea');
   htmlarea.className = "htmlarea";
 
@@ -1579 +1577 @@
   this._iframe = iframe;
   this._iframe.className = 'xinha_iframe';
-  this.freeLater(this, '_iframe');
+  this.freeLater(this, ['_htmlArea', '_iframe']);
   
     // creates & appends the status bar
@@ -1601 +1599 @@
     function form_onsubmit()
     {
-      editor._textArea.value = editor.outwardHtml(editor.getHTML());
+      if ( !editor.isSubmited )
+      {
+        // flag to prevent the editor to update original content onDispose if the submit is already done
+        editor.isSubmited = true;
+        editor._textArea.value = editor.outwardHtml(editor.getHTML());
+      }
       return true;
     }
     HTMLArea.Events.add(textarea.form, 'submit', form_onsubmit, 'prepend');
 
+    // onDispose get the HTMLArea content and update original textarea.
+    editor.notifyOn('dispose', form_onsubmit);
+
+    // update the original form.submit() function. See ticket #823
+    if ( !textarea.form.$XINHA_submit )
+    {
+      textarea.form.$XINHA_submit = textarea.form.submit;
+      textarea.form.submit = function()
+      {
+        for ( var i = this.elements.length; i--; )
+        {
+          var element = this.elements[i];
+          if ( element.type == 'textarea' )
+          {
+            for ( var a = __htmlareas.length; a--; )
+            {
+              var editor = __htmlareas[a];
+              if ( editor && editor._textArea == element )
+              {
+//                element.value = editor.outwardHtml(editor.getHTML());
+                editor.notifyOf('dispose', editor.config.onDisposeRemoveUI);
+              }
+            }
+          }
+        }
+        this.$XINHA_submit();
+      };
+    }
+    
     // this variable should already be saved when the editor was generating
     var initialTAContent = textarea.value;
@@ -1756 +1788 @@
       if ( rPanel.on && rPanel.panels.length && HTMLArea.hasDisplayedChildren(rPanel.div) )
       {
-        this._htmlArea.style.width = this._htmlArea.offsetWidth + parseInt(this.config.panel_dimensions.right, 10);
+        this._htmlArea.style.width = (this._htmlArea.offsetWidth + parseInt(this.config.panel_dimensions.right, 10)) + 'px';
       }
 
@@ -1762 +1794 @@
       if ( lPanel.on && lPanel.panels.length && HTMLArea.hasDisplayedChildren(lPanel.div) )
       {
-        this._htmlArea.style.width = this._htmlArea.offsetWidth + parseInt(this.config.panel_dimensions.left, 10);
+        this._htmlArea.style.width = (this._htmlArea.offsetWidth + parseInt(this.config.panel_dimensions.left, 10)) + 'px';
       }
     }
@@ -2382 +2414 @@
 
       // on window resize, resize the editor
-      HTMLArea.Events.add(window, 'resize', editor.sizeEditor, false, editor);
+      function win_onresize() { editor.sizeEditor(); }
+      HTMLArea.Events.add(window, 'resize', win_onresize, false, editor);
 
       editor.notifyOn('dispose',
@@ -2389 +2422 @@
           HTMLArea.Events.remove(doc, 'mousedown', editor.activateEditor, editor);
           HTMLArea.Events.remove(doc, ["keydown", "keypress", "mousedown", "mouseup", "drag"], listener);
-          HTMLArea.Events.remove(window, 'resize', editor.sizeEditor, editor);
+          HTMLArea.Events.remove(window, 'resize', win_onresize, editor);
         }
       );
@@ -6468 +6501 @@
 }
 
+/*
+---------------------------------------------------------------------------
+  POSITION
+---------------------------------------------------------------------------
+*/
+
 // find X position of an element
 HTMLArea.findPosX = function(obj)
@@ -6506 +6545 @@
 };
 
+/*
+---------------------------------------------------------------------------
+  LOADING MESSAGES
+---------------------------------------------------------------------------
+*/
+
 HTMLArea.prototype.setLoadingMessage = function(string, context, replace)
 {
-  if ( !this.config.showLoading || !document.getElementById("loading_sub_" + this._textArea.name) )
-  {
-    return;
-  }
   var elt = document.getElementById("loading_sub_" + this._textArea.name);
-  elt.innerHTML = HTMLArea._lc(string, context, replace);
+  if ( this.config.showLoading && elt )
+  {
+    elt.innerHTML = HTMLArea._lc(string, context, replace);
+  }
 };
 
 HTMLArea.prototype.removeLoadingMessage = function()
 {
-  if ( !this.config.showLoading || !document.getElementById("loading_" + this._textArea.name) )
-  {
-    return ;
-  }
-  document.body.removeChild(document.getElementById("loading_" + this._textArea.name));
-};
-
+  var elt = document.getElementById("loading_sub_" + this._textArea.name);
+  if ( this.config.showLoading && elt )
+  {
+    document.body.removeChild(elt);
+  }
+};
+
+/*
+---------------------------------------------------------------------------
+  FREE MEMORY
+---------------------------------------------------------------------------
+*/
+
+/**
+ * Cache a reference obj.prop to be later released from memory
+ * @param {object}       obj   The object to free
+ * @param {string|array} prop  The property to release or an array of properties (optional)
+ * @public
+ */
 HTMLArea.prototype.freeLater = function(obj,prop)
 {
-  this.toFree.push({o:obj,p:prop});
+  // manage multiple properties with an array
+  if ( prop && typeof prop !== 'string' && prop.length && prop.length > 0 )
+  {
+    for ( var i = prop.length; i--; )
+    {
+      this.toFree.push({o:obj,p:prop[i]});
+    }
+  }
+  else
+  {
+    this.toFree.push({o:obj,p:prop});
+  }
 };