Fix #6465 - drag drop for cards

[roojs1] / Roo / bootstrap / HtmlEditor.js

diff --git a/Roo/bootstrap/HtmlEditor.js b/Roo/bootstrap/HtmlEditor.js
index b8e87bd..244d4de 100644 (file)
--- a/Roo/bootstrap/HtmlEditor.js
+++ b/Roo/bootstrap/HtmlEditor.js
@@ -20,6 +20,7 @@ Roo.bootstrap.HtmlEditor = function(config){
     if (!this.toolbars) {
         this.toolbars = [];
     }
+    
     this.editorcore = new Roo.HtmlEditorCore(Roo.apply({ owner : this} , config));
     this.addEvents({
             /**
@@ -107,6 +108,11 @@ Roo.extend(Roo.bootstrap.HtmlEditor, Roo.bootstrap.TextArea,  {
      * @cfg {Array} toolbars Array of toolbars. - defaults to just the Standard one
      */
     toolbars : false,
+    
+     /**
+    * @cfg {Array} buttons Array of toolbar's buttons. - defaults to empty
+    */
+    btns : [],
    
      /**
      * @cfg {String} resizable  's' or 'se' or 'e' - wrapps the element in a
@@ -120,7 +126,7 @@ Roo.extend(Roo.bootstrap.HtmlEditor, Roo.bootstrap.TextArea,  {
    /**
      * @cfg {Number} width (in pixels)
      */   
-    width: 500,
+    width: false,
     
     /**
      * @cfg {Array} stylesheets url of stylesheets. set to [] to disable stylesheets.
@@ -141,9 +147,10 @@ Roo.extend(Roo.bootstrap.HtmlEditor, Roo.bootstrap.TextArea,  {
     iframePad:3,
     hideMode:'offsets',
     
-    
     tbContainer : false,
     
+    bodyCls : '',
+    
     toolbarContainer :function() {
         return this.wrap.select('.x-html-editor-tb',true).first();
     },
@@ -155,25 +162,25 @@ Roo.extend(Roo.bootstrap.HtmlEditor, Roo.bootstrap.TextArea,  {
      * @param {HtmlEditor} editor
      */
     createToolbar : function(){
+        Roo.log('renewing');
+        Roo.log("create toolbars");
         
-        this.toolbars = [ new Roo.bootstrap.HtmlEditor.ToolbarStandard({editor: this} ) ];
+        this.toolbars = [ new Roo.bootstrap.htmleditor.ToolbarStandard({editor: this} ) ];
         this.toolbars[0].render(this.toolbarContainer());
-         
-        Roo.log("create toolbars");
-        return;
-        if (!editor.toolbars || !editor.toolbars.length) {
-            editor.toolbars = [ new Roo.bootstrap.HtmlEditor.ToolbarStandard() ]; // 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);
-            editor.toolbars[i].init(editor);
-        }
-         
+        return;
         
+//        if (!editor.toolbars || !editor.toolbars.length) {
+//            editor.toolbars = [ new Roo.bootstrap.HtmlEditor.ToolbarStandard() ]; // 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);
+//            editor.toolbars[i].init(editor);
+//        }
     },
 
      
@@ -209,10 +216,8 @@ Roo.extend(Roo.bootstrap.HtmlEditor, Roo.bootstrap.TextArea,  {
         }
         this.createToolbar(this);
        
-        Roo.log('size1!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!11');
-        Roo.log(this.wrap.getSize());
-        if(!this.width){
-            Roo.log('run here');
+        
+        if(!this.width && this.resizable){
             this.setSize(this.wrap.getSize());
         }
         if (this.resizeEl) {
@@ -220,9 +225,6 @@ Roo.extend(Roo.bootstrap.HtmlEditor, Roo.bootstrap.TextArea,  {
             // should trigger onReize..
         }
         
-//        if(this.autosave && this.w){
-//            this.autoSaveFn = setInterval(this.autosave, 1000);
-//        }
     },
 
     // private
@@ -277,22 +279,25 @@ Roo.extend(Roo.bootstrap.HtmlEditor, Roo.bootstrap.TextArea,  {
             
 //            Roo.log('in');
 //            Roo.log(this.syncValue());
-            this.editorcore.syncValue();
-            this.inputEl().removeClass('hide');
+            this.syncValue();
+            this.inputEl().removeClass(['hide', 'x-hidden']);
             this.inputEl().dom.removeAttribute('tabIndex');
             this.inputEl().focus();
         }else{
             Roo.log('editor - hiding textarea');
 //            Roo.log('out')
 //            Roo.log(this.pushValue()); 
-            this.editorcore.pushValue();
+            this.pushValue();
             
-            this.inputEl().addClass('hide');
+            this.inputEl().addClass(['hide', 'x-hidden']);
             this.inputEl().dom.setAttribute('tabIndex', -1);
             //this.deferFocus();
         }
          
-        this.setSize(this.wrap.getSize());
+        if(this.resizable){
+            this.setSize(this.wrap.getSize());
+        }
+        
         this.fireEvent('editmodechange', this, this.editorcore.sourceEditMode);
     },
  
@@ -314,16 +319,16 @@ Roo.extend(Roo.bootstrap.HtmlEditor, Roo.bootstrap.TextArea,  {
         this.originalValue = this.getValue();
     },
 
-    /**
-     * Overridden and disabled. The editor element does not support standard valid/invalid marking. @hide
-     * @method
-     */
-    markInvalid : Roo.emptyFn,
-    /**
-     * Overridden and disabled. The editor element does not support standard valid/invalid marking. @hide
-     * @method
-     */
-    clearInvalid : Roo.emptyFn,
+//    /**
+//     * Overridden and disabled. The editor element does not support standard valid/invalid marking. @hide
+//     * @method
+//     */
+//    markInvalid : Roo.emptyFn,
+//    /**
+//     * Overridden and disabled. The editor element does not support standard valid/invalid marking. @hide
+//     * @method
+//     */
+//    clearInvalid : Roo.emptyFn,
 
     setValue : function(v){
         Roo.bootstrap.HtmlEditor.superclass.setValue.call(this, v);
@@ -372,8 +377,13 @@ Roo.extend(Roo.bootstrap.HtmlEditor, Roo.bootstrap.TextArea,  {
     
     // private
     syncValue : function()
-    {
+    {   
         this.editorcore.syncValue();
+    },
+    
+    pushValue : function()
+    {   
+        this.editorcore.pushValue();
     }
      
     
@@ -406,9 +416,7 @@ Roo.extend(Roo.bootstrap.HtmlEditor, Roo.bootstrap.TextArea,  {
     /**
      * @cfg {String} inputType @hide
      */
-    /**
-     * @cfg {String} invalidClass @hide
-     */
+     
     /**
      * @cfg {String} invalidText @hide
      */