X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-debug.js;h=b98d488887b32a90c8364c363fd0177c50b5ec18;hb=45c0cfffe7dfc381cd802d06b9ab8ff771931362;hp=f95b807da4da7f374eab9f9fe0fdc2b2bce9eb17;hpb=9bd0018a15fbfe826a4b3d236f7befff65293508;p=roojs1

diff --git a/roojs-debug.js b/roojs-debug.js
index f95b807da4..b98d488887 100644
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -49961,10 +49961,9 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
     owner : false,
     
      /**
-     * @cfg {String} resizable  's' or 'se' or 'e' - wrapps the element in a
-     *                        Roo.resizable.
+     * @cfg {String} css styling for resizing. (used on bootstrap only)
      */
-    resizable : false,
+    resize : false,
      /**
      * @cfg {Number} height (in pixels)
      */   
@@ -50097,17 +50096,19 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
         
         this.frameId = Roo.id();
         
-         
-        
-        var iframe = this.owner.wrap.createChild({
+        var ifcfg = {
             tag: 'iframe',
             cls: 'form-control', // bootstrap..
             id: this.frameId,
             name: this.frameId,
             frameBorder : 'no',
             'src' : Roo.SSL_SECURE_URL ? Roo.SSL_SECURE_URL  :  "javascript:false"
-        }, this.el
-        );
+        };
+        if (this.resize) {
+            ifcfg.style = { resize : this.resize };
+        }
+        
+        var iframe = this.owner.wrap.createChild(ifcfg, this.el); 
         
         
         this.iframe = iframe.dom;
@@ -50565,6 +50566,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
          
         
         e.preventDefault();
+        this.owner.fireEvent('paste', this);
         return false;
         // default behaveiour should be our local cleanup paste? (optional?)
         // for simple editor - we want to hammer the paste and get rid of everything... - so over-rideable..