X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/2e847cf21b8ab9d15fa167b315ca5b2fa92638fc..6a7e4474cba9d8be4b2ec445e10f1691f7277c50:/src/widgets/form/HtmlEditor.js
diff --git a/src/widgets/form/HtmlEditor.js b/src/widgets/form/HtmlEditor.js
index 3c2965d0..c9367504 100644
--- a/src/widgets/form/HtmlEditor.js
+++ b/src/widgets/form/HtmlEditor.js
@@ -1,6 +1,6 @@
/*!
- * Ext JS Library 3.1.1
- * Copyright(c) 2006-2010 Ext JS, LLC
+ * Ext JS Library 3.2.0
+ * Copyright(c) 2006-2010 Ext JS, Inc.
* licensing@extjs.com
* http://www.extjs.com/license
*/
@@ -173,7 +173,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
* @param {Boolean} sourceEdit True if source edit, false if standard editing.
*/
'editmodechange'
- )
+ );
},
// private
@@ -200,7 +200,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
*/
createToolbar : function(editor){
var items = [];
- var tipsEnabled = Ext.QuickTips && Ext.QuickTips.isEnabled();
+ var tipsEnabled = Ext.QuickTips && Ext.QuickTips.isEnabled();
function btn(id, toggle, handler){
@@ -219,13 +219,13 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
}
- if(this.enableFont && !Ext.isSafari2){
- var fontSelectItem = new Ext.Toolbar.Item({
- autoEl: {
- tag:'select',
- cls:'x-font-select',
- html: this.createFontOptions()
- }
+ if(this.enableFont && !Ext.isSafari2){
+ var fontSelectItem = new Ext.Toolbar.Item({
+ autoEl: {
+ tag:'select',
+ cls:'x-font-select',
+ html: this.createFontOptions()
+ }
});
items.push(
@@ -337,31 +337,31 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
})
);
}
- }
-
- // build the toolbar
- var tb = new Ext.Toolbar({
- renderTo: this.wrap.dom.firstChild,
- items: items
- });
-
- if (fontSelectItem) {
- this.fontSelect = fontSelectItem.el;
-
- this.mon(this.fontSelect, 'change', function(){
- var font = this.fontSelect.dom.value;
- this.relayCmd('fontname', font);
- this.deferFocus();
- }, this);
- }
-
-
- // stop form submits
- this.mon(tb.el, 'click', function(e){
- e.preventDefault();
- });
+ }
+
+ // build the toolbar
+ var tb = new Ext.Toolbar({
+ renderTo: this.wrap.dom.firstChild,
+ items: items
+ });
+
+ if (fontSelectItem) {
+ this.fontSelect = fontSelectItem.el;
+
+ this.mon(this.fontSelect, 'change', function(){
+ var font = this.fontSelect.dom.value;
+ this.relayCmd('fontname', font);
+ this.deferFocus();
+ }, this);
+ }
+
+ // stop form submits
+ this.mon(tb.el, 'click', function(e){
+ e.preventDefault();
+ });
this.tb = tb;
+ this.tb.doLayout();
},
onDisable: function(){
@@ -377,25 +377,26 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
setReadOnly: function(readOnly){
Ext.form.HtmlEditor.superclass.setReadOnly.call(this, readOnly);
- if(this.initialized){
- this.setDesignMode(!readOnly);
- var bd = this.getEditorBody();
- if(bd){
- bd.style.cursor = this.readOnly ? 'default' : 'text';
- }
- this.disableItems(readOnly);
- }
+ if(this.initialized){
+ this.setDesignMode(!readOnly);
+ var bd = this.getEditorBody();
+ if(bd){
+ bd.style.cursor = this.readOnly ? 'default' : 'text';
+ }
+ this.disableItems(readOnly);
+ }
},
/**
* Protected method that will not generally be called directly. It
* is called when the editor initializes the iframe with HTML contents. Override this method if you
* want to change the initialization markup of the iframe (e.g. to add stylesheets).
- *
- * Note: IE8-Standards has unwanted scroller behavior, so the default meta tag forces IE7 compatibility
+ *
+ * Note: IE8-Standards has unwanted scroller behavior, so the default meta tag forces IE7 compatibility
*/
getDocMarkup : function(){
- return '';
+ var h = Ext.fly(this.iframe).getHeight() - this.iframePad * 2;
+ return String.format('', this.iframePad, h);
},
// private
@@ -421,7 +422,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
this.el.dom.setAttribute('tabIndex', -1);
this.el.addClass('x-hidden');
if(Ext.isIE){ // fix IE 1px bogus margin
- this.el.applyStyles('margin-top:-1px;margin-bottom:-1px;')
+ this.el.applyStyles('margin-top:-1px;margin-bottom:-1px;');
}
this.wrap = this.el.wrap({
cls:'x-html-editor-wrap', cn:{cls:'x-html-editor-tb'}
@@ -446,7 +447,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
var iframe = document.createElement('iframe');
iframe.name = Ext.id();
iframe.frameBorder = '0';
- iframe.style.overflow = 'auto';
+ iframe.style.overflow = 'auto';
this.wrap.dom.appendChild(iframe);
this.iframe = iframe;
@@ -495,29 +496,29 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
}
}
},
-
- /* private
- * set current design mode. To enable, mode can be true or 'on', off otherwise
- */
- setDesignMode : function(mode){
- var doc ;
- if(doc = this.getDoc()){
- if(this.readOnly){
- mode = false;
- }
- doc.designMode = (/on|true/i).test(String(mode).toLowerCase()) ?'on':'off';
- }
-
- },
-
- // private
+
+ /* private
+ * set current design mode. To enable, mode can be true or 'on', off otherwise
+ */
+ setDesignMode : function(mode){
+ var doc ;
+ if(doc = this.getDoc()){
+ if(this.readOnly){
+ mode = false;
+ }
+ doc.designMode = (/on|true/i).test(String(mode).toLowerCase()) ?'on':'off';
+ }
+
+ },
+
+ // private
getDesignMode : function(){
- var doc = this.getDoc();
- if(!doc){ return ''; }
- return String(doc.designMode).toLowerCase();
-
- },
-
+ var doc = this.getDoc();
+ if(!doc){ return ''; }
+ return String(doc.designMode).toLowerCase();
+
+ },
+
disableItems: function(disabled){
if(this.fontSelect){
this.fontSelect.dom.disabled = disabled;
@@ -556,6 +557,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
* @param {Boolean} sourceEdit (optional) True for source edit, false for standard
*/
toggleSourceEdit : function(sourceEditMode){
+ var iframeHeight, elHeight;
if(sourceEditMode === undefined){
sourceEditMode = !this.sourceEditMode;
}
@@ -569,13 +571,20 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
}
}
if(this.sourceEditMode){
+ // grab the height of the containing panel before we hide the iframe
+ ls = this.getSize();
+
+ iframeHeight = Ext.get(this.iframe).getHeight();
+
this.disableItems(true);
this.syncValue();
this.iframe.className = 'x-hidden';
this.el.removeClass('x-hidden');
this.el.dom.removeAttribute('tabIndex');
this.el.focus();
+ this.el.dom.style.height = iframeHeight + 'px';
}else{
+ elHeight = parseInt(this.el.dom.style.height, 10);
if(this.initialized){
this.disableItems(this.readOnly);
}
@@ -584,11 +593,9 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
this.el.addClass('x-hidden');
this.el.dom.setAttribute('tabIndex', -1);
this.deferFocus();
- }
- var lastSize = this.lastSize;
- if(lastSize){
- delete this.lastSize;
- this.setSize(lastSize);
+
+ this.setSize(ls);
+ this.iframe.style.height = elHeight + 'px';
}
this.fireEvent('editmodechange', this, this.sourceEditMode);
},
@@ -691,13 +698,13 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
this.getEditorBody().innerHTML = v;
if(Ext.isGecko){
// Gecko hack, see: https://bugzilla.mozilla.org/show_bug.cgi?id=232791#c8
- this.setDesignMode(false); //toggle off first
-
+ this.setDesignMode(false); //toggle off first
+
}
- this.setDesignMode(true);
+ this.setDesignMode(true);
this.fireEvent('push', this, v);
}
-
+
}
},
@@ -720,7 +727,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, {
//Destroying the component during/before initEditor can cause issues.
try{
var dbody = this.getEditorBody(),
- ss = this.el.getStyles('font-size', 'font-family', 'background-image', 'background-repeat'),
+ ss = this.el.getStyles('font-size', 'font-family', 'background-image', 'background-repeat', 'background-color', 'color'),
doc,
fn;