support resize on bootstrap html editor

diff --git a/docs/json/roodata.json b/docs/json/roodata.json
index 915b14d..5fd5698 100644 (file)
--- a/docs/json/roodata.json
+++ b/docs/json/roodata.json
@@ -24828,6 +24828,14 @@
         "isOptional" : false,
         "optvals" : []
       },
+      {
+        "name" : "css",
+        "type" : "String",
+        "desc" : "styling for resizing. (used on bootstrap only)",
+        "memberOf" : "",
+        "isOptional" : false,
+        "optvals" : []
+      },
       {
         "name" : "disableClass",
         "type" : "String",
@@ -24879,14 +24887,6 @@
         "isOptional" : false,
         "optvals" : []
       },
-      {
-        "name" : "resizable",
-        "type" : "String",
-        "desc" : "'s' or 'se' or 'e' - wrapps the element in a\n                       Roo.resizable.",
-        "memberOf" : "",
-        "isOptional" : false,
-        "optvals" : []
-      },
       {
         "name" : "style",
         "type" : "String",
@@ -134163,26 +134163,16 @@
         "optvals" : []
       },
       {
-        "name" : "resizable",
+        "name" : "resize",
         "type" : "String",
-        "desc" : "'s' or 'se' or 'e' - wrapps the element in a\n                       Roo.resizable.",
+        "desc" : "l) - css resize of eleme",
         "memberOf" : "",
         "isOptional" : false,
-        "optvals" : []
-      },
-      {
-        "name" : "resize",
-        "type" : "string",
-        "desc" : "",
-        "memberOf" : "Roo.bootstrap.form.TextArea",
-        "isOptional" : false,
         "optvals" : [
           "none",
           "both",
           "horizontal",
-          "vertical",
-          "inherit",
-          "initial"
+          "vertical"
         ]
       },
       {
@@ -158615,7 +158605,7 @@
       {
         "name" : "minuteStep",
         "type" : "Number",
-        "desc" : "the minutes goes up/down by a fixed number, default 1",
+        "desc" : "the minutes is always the multiple of a fixed number, default 1",
         "memberOf" : "",
         "isOptional" : false,
         "optvals" : []

diff --git a/docs/src/Roo_HtmlEditorCore.js.html b/docs/src/Roo_HtmlEditorCore.js.html
index 0a30e57..289e026 100644 (file)
--- a/docs/src/Roo_HtmlEditorCore.js.html
+++ b/docs/src/Roo_HtmlEditorCore.js.html
@@ -96,10 +96,9 @@
     </span><span class="jsdoc-var">owner </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">false</span><span class="jsdoc-syntax">,
 
      </span><span class="jsdoc-comment">/**
-     * @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)
      */
-    </span><span class="jsdoc-var">resizable </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">false</span><span class="jsdoc-syntax">,
+    </span><span class="jsdoc-var">resize </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">false</span><span class="jsdoc-syntax">,
      </span><span class="jsdoc-comment">/**
      * @cfg {Number} height (in pixels)
      */
@@ -232,17 +231,19 @@
 
         </span><span class="jsdoc-var">this.frameId </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">Roo.id</span><span class="jsdoc-syntax">();
 
-
-
-        </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">iframe </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this.owner.wrap.createChild</span><span class="jsdoc-syntax">({
+        </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">ifcfg </span><span class="jsdoc-syntax">= {
             </span><span class="jsdoc-var">tag</span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">'iframe'</span><span class="jsdoc-syntax">,
             </span><span class="jsdoc-var">cls</span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">'form-control'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-comment">// bootstrap..
             </span><span class="jsdoc-var">id</span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">this.frameId</span><span class="jsdoc-syntax">,
             </span><span class="jsdoc-var">name</span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">this.frameId</span><span class="jsdoc-syntax">,
             </span><span class="jsdoc-var">frameBorder </span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">'no'</span><span class="jsdoc-syntax">,
             </span><span class="jsdoc-string">'src' </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">Roo.SSL_SECURE_URL </span><span class="jsdoc-syntax">? </span><span class="jsdoc-var">Roo.SSL_SECURE_URL  </span><span class="jsdoc-syntax">:  </span><span class="jsdoc-string">&quot;javascript:false&quot;
-        </span><span class="jsdoc-syntax">}, </span><span class="jsdoc-var">this.el
-        </span><span class="jsdoc-syntax">);
+        </span><span class="jsdoc-syntax">};
+        </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.resize</span><span class="jsdoc-syntax">) {
+            </span><span class="jsdoc-var">ifcfg.style </span><span class="jsdoc-syntax">= { </span><span class="jsdoc-var">resize </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">this.resize </span><span class="jsdoc-syntax">};
+        }
+
+        </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">iframe </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this.owner.wrap.createChild</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">ifcfg</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">this.el</span><span class="jsdoc-syntax">);
 
 
         </span><span class="jsdoc-var">this.iframe </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">iframe.dom</span><span class="jsdoc-syntax">;

diff --git a/docs/src/Roo_bootstrap_form_HtmlEditor.js.html b/docs/src/Roo_bootstrap_form_HtmlEditor.js.html
index acd9f15..31bf14d 100644 (file)
--- a/docs/src/Roo_bootstrap_form_HtmlEditor.js.html
+++ b/docs/src/Roo_bootstrap_form_HtmlEditor.js.html
@@ -115,10 +115,9 @@
     </span><span class="jsdoc-var">btns </span><span class="jsdoc-syntax">: [],
 
      </span><span class="jsdoc-comment">/**
-     * @cfg {String} resizable  's' or 'se' or 'e' - wrapps the element in a
-     *                        Roo.resizable.
+     * @cfg {String} resize  (none|both|horizontal|vertical) - css resize of element
      */
-    </span><span class="jsdoc-var">resizable </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">false</span><span class="jsdoc-syntax">,
+    </span><span class="jsdoc-var">resize </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">false</span><span class="jsdoc-syntax">,
      </span><span class="jsdoc-comment">/**
      * @cfg {Number} height (in pixels)
      */
@@ -197,33 +196,11 @@
 
         </span><span class="jsdoc-var">this.editorcore.onRender</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">ct</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">position</span><span class="jsdoc-syntax">);
 
-        </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.resizable</span><span class="jsdoc-syntax">) {
-            </span><span class="jsdoc-var">this.resizeEl </span><span class="jsdoc-syntax">= </span><span class="jsdoc-keyword">new </span><span class="jsdoc-var">Roo.Resizable</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.wrap</span><span class="jsdoc-syntax">, {
-                </span><span class="jsdoc-var">pinned </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">true</span><span class="jsdoc-syntax">,
-                </span><span class="jsdoc-var">wrap</span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">true</span><span class="jsdoc-syntax">,
-                </span><span class="jsdoc-var">dynamic </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">true</span><span class="jsdoc-syntax">,
-                </span><span class="jsdoc-var">minHeight </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">this.height</span><span class="jsdoc-syntax">,
-                </span><span class="jsdoc-var">height</span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">this.height</span><span class="jsdoc-syntax">,
-                </span><span class="jsdoc-var">handles </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">this.resizable</span><span class="jsdoc-syntax">,
-                </span><span class="jsdoc-var">width</span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">this.width</span><span class="jsdoc-syntax">,
-                </span><span class="jsdoc-var">listeners </span><span class="jsdoc-syntax">: {
-                    </span><span class="jsdoc-var">resize </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">r</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">w</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">h</span><span class="jsdoc-syntax">) {
-                        </span><span class="jsdoc-var">_t.onResize</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">w</span><span class="jsdoc-syntax">,</span><span class="jsdoc-var">h</span><span class="jsdoc-syntax">); </span><span class="jsdoc-comment">// -something
-                    </span><span class="jsdoc-syntax">}
-                }
-            });
 
-        }
         </span><span class="jsdoc-var">this.createToolbar</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this</span><span class="jsdoc-syntax">);
 
 
-        </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(!</span><span class="jsdoc-var">this.width </span><span class="jsdoc-syntax">&amp;&amp; </span><span class="jsdoc-var">this.resizable</span><span class="jsdoc-syntax">){
-            </span><span class="jsdoc-var">this.setSize</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.wrap.getSize</span><span class="jsdoc-syntax">());
-        }
-        </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.resizeEl</span><span class="jsdoc-syntax">) {
-            </span><span class="jsdoc-var">this.resizeEl.resizeTo.defer</span><span class="jsdoc-syntax">(100, </span><span class="jsdoc-var">this.resizeEl</span><span class="jsdoc-syntax">,[ </span><span class="jsdoc-var">this.width</span><span class="jsdoc-syntax">,</span><span class="jsdoc-var">this.height </span><span class="jsdoc-syntax">] );
-            </span><span class="jsdoc-comment">// should trigger onReize..
-        </span><span class="jsdoc-syntax">}
+
 
     },
 
@@ -294,9 +271,9 @@
             </span><span class="jsdoc-comment">//this.deferFocus();
         </span><span class="jsdoc-syntax">}
 
-        </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.resizable</span><span class="jsdoc-syntax">){
-            </span><span class="jsdoc-var">this.setSize</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.wrap.getSize</span><span class="jsdoc-syntax">());
-        }
+        </span><span class="jsdoc-comment">//if(this.resizable){
+        //    this.setSize(this.wrap.getSize());
+        //}
 
         </span><span class="jsdoc-var">this.fireEvent</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'editmodechange'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">this</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">this.editorcore.sourceEditMode</span><span class="jsdoc-syntax">);
     },

diff --git a/docs/src/Roo_bootstrap_form_TimeField.js.html b/docs/src/Roo_bootstrap_form_TimeField.js.html
index a77240d..60bf02e 100644 (file)
--- a/docs/src/Roo_bootstrap_form_TimeField.js.html
+++ b/docs/src/Roo_bootstrap_form_TimeField.js.html
@@ -9,7 +9,7 @@
  * @class Roo.bootstrap.form.TimeField
  * @extends Roo.bootstrap.form.Input
  * Bootstrap DateField class
- * @cfg {Number} minuteStep the minutes goes up/down by a fixed number, default 1
+ * @cfg {Number} minuteStep the minutes is always the multiple of a fixed number, default 1
  * 
  * 
  * @constructor
@@ -433,14 +433,16 @@
     </span><span class="jsdoc-var">onIncrementMinutes</span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">()
     {
         </span><span class="jsdoc-var">Roo.log</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'onIncrementMinutes'</span><span class="jsdoc-syntax">);
-        </span><span class="jsdoc-var">this.time </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this.time.add</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">Date.MINUTE</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">this.minuteStep</span><span class="jsdoc-syntax">);
+        </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">minutesToAdd </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">Math.round</span><span class="jsdoc-syntax">((</span><span class="jsdoc-var">parseInt</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.time.format</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'i'</span><span class="jsdoc-syntax">)) + </span><span class="jsdoc-var">this.minuteStep</span><span class="jsdoc-syntax">) / </span><span class="jsdoc-var">this.minuteStep</span><span class="jsdoc-syntax">) * </span><span class="jsdoc-var">this.minuteStep </span><span class="jsdoc-syntax">- </span><span class="jsdoc-var">parseInt</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.time.format</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'i'</span><span class="jsdoc-syntax">));
+        </span><span class="jsdoc-var">this.time </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this.time.add</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">Date.MINUTE</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">minutesToAdd</span><span class="jsdoc-syntax">);
         </span><span class="jsdoc-var">this.update</span><span class="jsdoc-syntax">();
     },
 
     </span><span class="jsdoc-var">onDecrementMinutes</span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">()
     {
         </span><span class="jsdoc-var">Roo.log</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'onDecrementMinutes'</span><span class="jsdoc-syntax">);
-        </span><span class="jsdoc-var">this.time </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this.time.add</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">Date.MINUTE</span><span class="jsdoc-syntax">, -1 * </span><span class="jsdoc-var">this.minuteStep</span><span class="jsdoc-syntax">);
+        </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">minutesToSubtract </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">parseInt</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.time.format</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'i'</span><span class="jsdoc-syntax">)) - </span><span class="jsdoc-var">Math.round</span><span class="jsdoc-syntax">((</span><span class="jsdoc-var">parseInt</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.time.format</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'i'</span><span class="jsdoc-syntax">)) - </span><span class="jsdoc-var">this.minuteStep</span><span class="jsdoc-syntax">) / </span><span class="jsdoc-var">this.minuteStep</span><span class="jsdoc-syntax">) * </span><span class="jsdoc-var">this.minuteStep</span><span class="jsdoc-syntax">;
+        </span><span class="jsdoc-var">this.time </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this.time.add</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">Date.MINUTE</span><span class="jsdoc-syntax">, -1 * </span><span class="jsdoc-var">minutesToSubtract</span><span class="jsdoc-syntax">);
         </span><span class="jsdoc-var">this.update</span><span class="jsdoc-syntax">();
     },
 

diff --git a/docs/symbols/Roo.HtmlEditorCore.json b/docs/symbols/Roo.HtmlEditorCore.json
index e77b1f7..4a94ce1 100644 (file)
--- a/docs/symbols/Roo.HtmlEditorCore.json
+++ b/docs/symbols/Roo.HtmlEditorCore.json
@@ -90,6 +90,14 @@
       "isOptional" : false,
       "optvals" : []
     },
+    {
+      "name" : "css",
+      "type" : "String",
+      "desc" : "styling for resizing. (used on bootstrap only)",
+      "memberOf" : "",
+      "isOptional" : false,
+      "optvals" : []
+    },
     {
       "name" : "enableBlocks",
       "type" : "boolean",
@@ -114,14 +122,6 @@
       "isOptional" : false,
       "optvals" : []
     },
-    {
-      "name" : "resizable",
-      "type" : "String",
-      "desc" : "'s' or 'se' or 'e' - wrapps the element in a\n                       Roo.resizable.",
-      "memberOf" : "",
-      "isOptional" : false,
-      "optvals" : []
-    },
     {
       "name" : "height",
       "type" : "Number",

diff --git a/docs/symbols/Roo.bootstrap.form.HtmlEditor.json b/docs/symbols/Roo.bootstrap.form.HtmlEditor.json
index 78feb02..28629ac 100644 (file)
--- a/docs/symbols/Roo.bootstrap.form.HtmlEditor.json
+++ b/docs/symbols/Roo.bootstrap.form.HtmlEditor.json
@@ -128,14 +128,6 @@
       "isOptional" : false,
       "optvals" : []
     },
-    {
-      "name" : "resizable",
-      "type" : "String",
-      "desc" : "'s' or 'se' or 'e' - wrapps the element in a\n                       Roo.resizable.",
-      "memberOf" : "",
-      "isOptional" : false,
-      "optvals" : []
-    },
     {
       "name" : "toolbars",
       "type" : "Array",
@@ -501,17 +493,15 @@
     },
     {
       "name" : "resize",
-      "type" : "string",
-      "desc" : "",
-      "memberOf" : "Roo.bootstrap.form.TextArea",
+      "type" : "String",
+      "desc" : "l) - css resize of eleme",
+      "memberOf" : "",
       "isOptional" : false,
       "optvals" : [
         "none",
         "both",
         "horizontal",
-        "vertical",
-        "inherit",
-        "initial"
+        "vertical"
       ]
     },
     {

diff --git a/docs/symbols/Roo.bootstrap.form.TimeField.json b/docs/symbols/Roo.bootstrap.form.TimeField.json
index 450403c..a724926 100644 (file)
--- a/docs/symbols/Roo.bootstrap.form.TimeField.json
+++ b/docs/symbols/Roo.bootstrap.form.TimeField.json
@@ -98,7 +98,7 @@
     {
       "name" : "minuteStep",
       "type" : "Number",
-      "desc" : "the minutes goes up/down by a fixed number, default 1",
+      "desc" : "the minutes is always the multiple of a fixed number, default 1",
       "memberOf" : "",
       "isOptional" : false,
       "optvals" : []