X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=Roo%2Fbootstrap%2Fform%2FHtmlEditor.js;fp=Roo%2Fbootstrap%2FHtmlEditor.js;h=e86dab7693742b3304950575d15f4b451b825df0;hp=244d4de5df33a2873c60ce699a97526ffb991e8d;hb=e01802ac69da0ec0c9ccecc295beff82c1779f68;hpb=0fa7894b7489284160ff14afdca7b6911983357f diff --git a/Roo/bootstrap/HtmlEditor.js b/Roo/bootstrap/form/HtmlEditor.js similarity index 93% rename from Roo/bootstrap/HtmlEditor.js rename to Roo/bootstrap/form/HtmlEditor.js index 244d4de5df..e86dab7693 100644 --- a/Roo/bootstrap/HtmlEditor.js +++ b/Roo/bootstrap/form/HtmlEditor.js @@ -6,8 +6,8 @@ */ /** - * @class Roo.bootstrap.HtmlEditor - * @extends Roo.bootstrap.TextArea + * @class Roo.bootstrap.form.HtmlEditor + * @extends Roo.bootstrap.form.TextArea * Bootstrap HtmlEditor class * @constructor @@ -15,8 +15,8 @@ * @param {Object} config The config object */ -Roo.bootstrap.HtmlEditor = function(config){ - Roo.bootstrap.HtmlEditor.superclass.constructor.call(this, config); +Roo.bootstrap.form.HtmlEditor = function(config){ + Roo.bootstrap.form.HtmlEditor.superclass.constructor.call(this, config); if (!this.toolbars) { this.toolbars = []; } @@ -101,7 +101,7 @@ Roo.bootstrap.HtmlEditor = function(config){ }; -Roo.extend(Roo.bootstrap.HtmlEditor, Roo.bootstrap.TextArea, { +Roo.extend(Roo.bootstrap.form.HtmlEditor, Roo.bootstrap.form.TextArea, { /** @@ -165,20 +165,20 @@ Roo.extend(Roo.bootstrap.HtmlEditor, Roo.bootstrap.TextArea, { Roo.log('renewing'); Roo.log("create toolbars"); - this.toolbars = [ new Roo.bootstrap.htmleditor.ToolbarStandard({editor: this} ) ]; + this.toolbars = [ new Roo.bootstrap.form.HtmlEditorToolbarStandard({editor: this} ) ]; this.toolbars[0].render(this.toolbarContainer()); return; // if (!editor.toolbars || !editor.toolbars.length) { -// editor.toolbars = [ new Roo.bootstrap.HtmlEditor.ToolbarStandard() ]; // can be empty? +// editor.toolbars = [ new Roo.bootstrap.form.HtmlEditorToolbarStandard() ]; // can be empty? // } // // for (var i =0 ; i < editor.toolbars.length;i++) { // editor.toolbars[i] = Roo.factory( // typeof(editor.toolbars[i]) == 'string' ? // { xtype: editor.toolbars[i]} : editor.toolbars[i], -// Roo.bootstrap.HtmlEditor); +// Roo.bootstrap.form.HtmlEditor); // editor.toolbars[i].init(editor); // } }, @@ -189,7 +189,7 @@ Roo.extend(Roo.bootstrap.HtmlEditor, Roo.bootstrap.TextArea, { { // Roo.log("Call onRender: " + this.xtype); var _t = this; - Roo.bootstrap.HtmlEditor.superclass.onRender.call(this, ct, position); + Roo.bootstrap.form.HtmlEditor.superclass.onRender.call(this, ct, position); this.wrap = this.inputEl().wrap({ cls:'x-html-editor-wrap', cn:{cls:'x-html-editor-tb'} @@ -231,7 +231,7 @@ Roo.extend(Roo.bootstrap.HtmlEditor, Roo.bootstrap.TextArea, { onResize : function(w, h) { Roo.log('resize: ' +w + ',' + h ); - Roo.bootstrap.HtmlEditor.superclass.onResize.apply(this, arguments); + Roo.bootstrap.form.HtmlEditor.superclass.onResize.apply(this, arguments); var ew = false; var eh = false; @@ -331,7 +331,7 @@ Roo.extend(Roo.bootstrap.HtmlEditor, Roo.bootstrap.TextArea, { // clearInvalid : Roo.emptyFn, setValue : function(v){ - Roo.bootstrap.HtmlEditor.superclass.setValue.call(this, v); + Roo.bootstrap.form.HtmlEditor.superclass.setValue.call(this, v); this.editorcore.pushValue(); },