Upgrade to ExtJS 3.3.1 - Released 11/30/2010

[extjs.git] / src / widgets / form / HtmlEditor.js

diff --git a/src/widgets/form/HtmlEditor.js b/src/widgets/form/HtmlEditor.js
index 0f93157..20e1f91 100644 (file)
--- a/src/widgets/form/HtmlEditor.js
+++ b/src/widgets/form/HtmlEditor.js
@@ -1,8 +1,8 @@
 /*!
 /*!

- * Ext JS Library 3.2.1
- * Copyright(c) 2006-2010 Ext JS, Inc.
- * licensing@extjs.com
- * http://www.extjs.com/license
+ * Ext JS Library 3.3.1
+ * Copyright(c) 2006-2010 Sencha Inc.
+ * licensing@sencha.com
+ * http://www.sencha.com/license

  */
 /**
  * @class Ext.form.HtmlEditor
  */
 /**
  * @class Ext.form.HtmlEditor


@@ -174,6 +174,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
              */
             'editmodechange'
         );
              */
             'editmodechange'
         );

+        Ext.form.HtmlEditor.superclass.initComponent.call(this);

     },
 
     // private
     },
 
     // private


@@ -452,6 +453,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
         iframe.name = Ext.id();
         iframe.frameBorder = '0';
         iframe.style.overflow = 'auto';
         iframe.name = Ext.id();
         iframe.frameBorder = '0';
         iframe.style.overflow = 'auto';

+        iframe.src = Ext.SSL_SECURE_URL;

 
         this.wrap.dom.appendChild(iframe);
         this.iframe = iframe;
 
         this.wrap.dom.appendChild(iframe);
         this.iframe = iframe;


@@ -505,8 +507,8 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
      * set current design mode. To enable, mode can be true or 'on', off otherwise
      */
     setDesignMode : function(mode){
      * set current design mode. To enable, mode can be true or 'on', off otherwise
      */
     setDesignMode : function(mode){

-        var doc ;
-        if(doc = this.getDoc()){
+        var doc = this.getDoc();
+        if (doc) {

             if(this.readOnly){
                 mode = false;
             }
             if(this.readOnly){
                 mode = false;
             }


@@ -562,8 +564,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
      */
     toggleSourceEdit : function(sourceEditMode){
         var iframeHeight,
      */
     toggleSourceEdit : function(sourceEditMode){
         var iframeHeight,

-            elHeight,
-            ls;
+            elHeight;

 
         if (sourceEditMode === undefined) {
             sourceEditMode = !this.sourceEditMode;
 
         if (sourceEditMode === undefined) {
             sourceEditMode = !this.sourceEditMode;


@@ -579,7 +580,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
         }
         if (this.sourceEditMode) {
             // grab the height of the containing panel before we hide the iframe
         }
         if (this.sourceEditMode) {
             // grab the height of the containing panel before we hide the iframe

-            ls = this.getSize();
+            this.previousSize = this.getSize();

 
             iframeHeight = Ext.get(this.iframe).getHeight();
 
 
             iframeHeight = Ext.get(this.iframe).getHeight();
 


@@ -602,7 +603,8 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
             this.el.dom.setAttribute('tabIndex', -1);
             this.deferFocus();
 
             this.el.dom.setAttribute('tabIndex', -1);
             this.deferFocus();
 

-            this.setSize(ls);
+            this.setSize(this.previousSize);
+            delete this.previousSize;

             this.iframe.style.height = elHeight + 'px';
         }
         this.fireEvent('editmodechange', this, this.sourceEditMode);
             this.iframe.style.height = elHeight + 'px';
         }
         this.fireEvent('editmodechange', this, this.sourceEditMode);


@@ -781,7 +783,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
     },
 
     // private
     },
 
     // private

-    onDestroy : function(){
+    beforeDestroy : function(){

         if(this.monitorTask){
             Ext.TaskMgr.stop(this.monitorTask);
         }
         if(this.monitorTask){
             Ext.TaskMgr.stop(this.monitorTask);
         }


@@ -801,12 +803,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
                 this.wrap.remove();
             }
         }
                 this.wrap.remove();
             }
         }

-
-        if(this.el){
-            this.el.removeAllListeners();
-            this.el.remove();
-        }
-        this.purgeListeners();
+        Ext.form.HtmlEditor.superclass.beforeDestroy.call(this);

     },
 
     // private
     },
 
     // private