git.ithinksw.org
/
extjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to ExtJS 3.3.0 - Released 10/06/2010
[extjs.git]
/
docs
/
source
/
HtmlEditor.html
diff --git
a/docs/source/HtmlEditor.html
b/docs/source/HtmlEditor.html
index
fe1d680
..
2090eb0
100644
(file)
--- a/
docs/source/HtmlEditor.html
+++ b/
docs/source/HtmlEditor.html
@@
-7,7
+7,7
@@
</head>
<body onload="prettyPrint();">
<pre class="prettyprint lang-js">/*!
</head>
<body onload="prettyPrint();">
<pre class="prettyprint lang-js">/*!
- * Ext JS Library 3.
2.1
+ * Ext JS Library 3.
3.0
* Copyright(c) 2006-2010 Ext JS, Inc.
* licensing@extjs.com
* http://www.extjs.com/license
* Copyright(c) 2006-2010 Ext JS, Inc.
* licensing@extjs.com
* http://www.extjs.com/license
@@
-182,6
+182,7
@@
Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
*/
'editmodechange'
);
*/
'editmodechange'
);
+ Ext.form.HtmlEditor.superclass.initComponent.call(this);
},
// private
},
// private
@@
-460,6
+461,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;
@@
-513,8
+515,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;
}
@@
-570,8
+572,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;
@@
-587,7
+588,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();
@@
-610,7
+611,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);
@@
-789,7
+791,7
@@
Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
},
// private
},
// private
-
on
Destroy : function(){
+
before
Destroy : function(){
if(this.monitorTask){
Ext.TaskMgr.stop(this.monitorTask);
}
if(this.monitorTask){
Ext.TaskMgr.stop(this.monitorTask);
}
@@
-809,12
+811,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