sync

diff --git a/Roo/bootstrap/Button.js b/Roo/bootstrap/Button.js
index d236de9..30d3f00 100644 (file)
--- a/Roo/bootstrap/Button.js
+++ b/Roo/bootstrap/Button.js
@@ -375,8 +375,8 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
      */
     toggleActive : function(e)
     {
-        this.setActive(!this.pressed);
-        this.fireEvent('toggle', this, e, !this.pressed);
+        this.setActive(!this.pressed); // this modifies pressed...
+        this.fireEvent('toggle', this, e, this.pressed);
     },
      /**
      * get the current active state

diff --git a/Roo/bootstrap/Card.js b/Roo/bootstrap/Card.js
index dbfd9f3..02e05c7 100644 (file)
--- a/Roo/bootstrap/Card.js
+++ b/Roo/bootstrap/Card.js
@@ -67,11 +67,13 @@ Roo.bootstrap.Card = function(config){
         /**
          * @event drop
          * When a element a card is dropped
-         * @param {Roo.bootstrap.Element} this
-         * @param {Roo.Element} n the node being dropped?
-         * @param {Object} dd Drag and drop data
-         * @param {Roo.EventObject} e
-         * @param {Roo.EventObject} data  the data passed via getDragData
+         * @param {Roo.bootstrap.Card} this
+         *
+         * 
+         * @param {Roo.bootstrap.Card} move_card the card being dropped?
+         * @param {String} position 'above' or 'below'
+         * @param {Roo.bootstrap.Card} next_to_card What card position is relative to of 'false' for empty list.
+        
          */
         'drop' : true,
          /**
@@ -542,22 +544,50 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component,  {
         if (info === false) {
             return false;
         }
-        
-        if (this.fireEvent("drop", this, n, dd, e, data) === false) {
+        this.dropPlaceHolder('hide');
+  
+         
+    
+    
+    
+        this.acceptCard(data.source, info.position, info.card, info.items_n);
+        return true;
+         
+    },
+    firstChildCard : function()
+    {
+        for (var i = 0;i< this.items.length;i++) {
+            
+            if (!this.items[i].el.hasClass('card')) {
+                 continue;
+            }
+            return this.items[i];
+        }
+        return this.items.length ? this.items[this.items.length-1] : false; // don't try and put stuff after the cards...
+    },
+    /**
+     * accept card
+     *
+     * -        card.acceptCard(move_card, info.position, info.card, info.items_n);
+
+     */
+    acceptCard : function(move_card,  position, next_to_card )
+    {
+        if (this.fireEvent("drop", this, move_card, position, next_to_card) === false) {
             return false;
         }
-         
-        this.dropPlaceHolder('hide');
         
-        // do the dom manipulation first..
-        var dom = data.source.el.dom;
+        var to_items_n = next_to_card ? this.items.indexOf(next_to_card) : 0;
+        
+        
+        var dom = move_card.el.dom;
         dom.parentNode.removeChild(dom);
         
         
-        if (info.card !== true) {
-            var cardel = info.card.el.dom;
+        if (next_to_card !== false) {
+            var cardel = next_to_card.el.dom;
             
-            if (info.position == 'above') {
+            if (position == 'above') {
                 cardel.parentNode.insertBefore(dom, cardel);
             } else if (cardel.nextSibling) {
                 cardel.parentNode.insertBefore(dom,cardel.nextSibling);
@@ -577,33 +607,36 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component,  {
         
         // remove Card from items.
         
-        var old_parent = data.source.parent();
+        var old_parent = move_card.parent();
         
-        old_parent.items = old_parent.items.filter(function(e) { return e != data.source });
+        old_parent.items = old_parent.items.filter(function(e) { return e != move_card });
         
         if (this.items.length) {
             var nitems = [];
             //Roo.log([info.items_n, info.position, this.items.length]);
             for (var i =0; i < this.items.length; i++) {
-                if (i == info.items_n && info.position == 'above') {
-                    nitems.push(data.source);
+                if (i == to_items_n && position == 'above') {
+                    nitems.push(move_card);
                 }
                 nitems.push(this.items[i]);
-                if (i == info.items_n && info.position == 'below') {
-                    nitems.push(data.source);
+                if (i == to_items_n && position == 'below') {
+                    nitems.push(move_card);
                 }
             }
             this.items = nitems;
             Roo.log(this.items);
         } else {
-            this.items.push(data.source);
+            this.items.push(move_card);
         }
         
-        data.source.parentId = this.id;
+        move_card.parentId = this.id;
         
         return true;
+        
+        
     },
     
+    
     /**    Decide whether to drop above or below a View node. */
     getDropPoint : function(e, n, dd)
     {

diff --git a/docs/json/roodata.json b/docs/json/roodata.json
index 3e12fec..d1c1a35 100644 (file)
--- a/docs/json/roodata.json
+++ b/docs/json/roodata.json
@@ -22004,6 +22004,12 @@
   },
   "Roo.bootstrap.CheckBox" : {
     "props" : [
+      {
+        "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+        "type" : "String",
+        "desc" : "inputType",
+        "memberOf" : "Roo.bootstrap.Input"
+      },
       {
         "name" : "accept",
         "type" : "String",
@@ -22196,12 +22202,6 @@
         "desc" : "inline the element (default false)",
         "memberOf" : ""
       },
-      {
-        "name" : "inputType",
-        "type" : "String",
-        "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-        "memberOf" : "Roo.bootstrap.Input"
-      },
       {
         "name" : "inputValue",
         "type" : "String",
@@ -23447,6 +23447,12 @@
   },
   "Roo.bootstrap.ComboBox" : {
     "props" : [
+      {
+        "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+        "type" : "String",
+        "desc" : "inputType",
+        "memberOf" : "Roo.bootstrap.Input"
+      },
       {
         "name" : "accept",
         "type" : "String",
@@ -23753,12 +23759,6 @@
           "right"
         ]
       },
-      {
-        "name" : "inputType",
-        "type" : "String",
-        "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-        "memberOf" : "Roo.bootstrap.Input"
-      },
       {
         "name" : "invalidClass",
         "type" : "String",
@@ -25806,6 +25806,12 @@
   },
   "Roo.bootstrap.DateField" : {
     "props" : [
+      {
+        "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+        "type" : "String",
+        "desc" : "inputType",
+        "memberOf" : "Roo.bootstrap.Input"
+      },
       {
         "name" : "accept",
         "type" : "String",
@@ -26004,12 +26010,6 @@
           "right"
         ]
       },
-      {
-        "name" : "inputType",
-        "type" : "String",
-        "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-        "memberOf" : "Roo.bootstrap.Input"
-      },
       {
         "name" : "invalidClass",
         "type" : "String",
@@ -31522,6 +31522,12 @@
   },
   "Roo.bootstrap.HtmlEditor" : {
     "props" : [
+      {
+        "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+        "type" : "String",
+        "desc" : "inputType",
+        "memberOf" : "Roo.bootstrap.Input"
+      },
       {
         "name" : "accept",
         "type" : "String",
@@ -33005,6 +33011,12 @@
   },
   "Roo.bootstrap.Input" : {
     "props" : [
+      {
+        "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+        "type" : "String",
+        "desc" : "inputType",
+        "memberOf" : ""
+      },
       {
         "name" : "accept",
         "type" : "String",
@@ -33173,12 +33185,6 @@
           "right"
         ]
       },
-      {
-        "name" : "inputType",
-        "type" : "String",
-        "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-        "memberOf" : ""
-      },
       {
         "name" : "invalidClass",
         "type" : "String",
@@ -38749,6 +38755,12 @@
   },
   "Roo.bootstrap.MoneyField" : {
     "props" : [
+      {
+        "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+        "type" : "String",
+        "desc" : "inputType",
+        "memberOf" : "Roo.bootstrap.Input"
+      },
       {
         "name" : "accept",
         "type" : "String",
@@ -39101,12 +39113,6 @@
           "right"
         ]
       },
-      {
-        "name" : "inputType",
-        "type" : "String",
-        "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-        "memberOf" : "Roo.bootstrap.Input"
-      },
       {
         "name" : "invalidClass",
         "type" : "String",
@@ -40243,6 +40249,12 @@
   },
   "Roo.bootstrap.MonthField" : {
     "props" : [
+      {
+        "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+        "type" : "String",
+        "desc" : "inputType",
+        "memberOf" : "Roo.bootstrap.Input"
+      },
       {
         "name" : "accept",
         "type" : "String",
@@ -40411,12 +40423,6 @@
           "right"
         ]
       },
-      {
-        "name" : "inputType",
-        "type" : "String",
-        "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-        "memberOf" : "Roo.bootstrap.Input"
-      },
       {
         "name" : "invalidClass",
         "type" : "String",
@@ -45380,6 +45386,12 @@
   },
   "Roo.bootstrap.NumberField" : {
     "props" : [
+      {
+        "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+        "type" : "String",
+        "desc" : "inputType",
+        "memberOf" : "Roo.bootstrap.Input"
+      },
       {
         "name" : "accept",
         "type" : "String",
@@ -45578,12 +45590,6 @@
           "right"
         ]
       },
-      {
-        "name" : "inputType",
-        "type" : "String",
-        "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-        "memberOf" : "Roo.bootstrap.Input"
-      },
       {
         "name" : "invalidClass",
         "type" : "String",
@@ -47707,6 +47713,12 @@
   },
   "Roo.bootstrap.PhoneInput" : {
     "props" : [
+      {
+        "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+        "type" : "String",
+        "desc" : "inputType",
+        "memberOf" : "Roo.bootstrap.Input"
+      },
       {
         "name" : "accept",
         "type" : "String",
@@ -47897,12 +47909,6 @@
           "right"
         ]
       },
-      {
-        "name" : "inputType",
-        "type" : "String",
-        "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-        "memberOf" : "Roo.bootstrap.Input"
-      },
       {
         "name" : "invalidClass",
         "type" : "String",
@@ -50309,6 +50315,12 @@
   },
   "Roo.bootstrap.RadioSet" : {
     "props" : [
+      {
+        "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+        "type" : "String",
+        "desc" : "inputType",
+        "memberOf" : "Roo.bootstrap.Input"
+      },
       {
         "name" : "accept",
         "type" : "String",
@@ -50487,12 +50499,6 @@
           "false"
         ]
       },
-      {
-        "name" : "inputType",
-        "type" : "String",
-        "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-        "memberOf" : "Roo.bootstrap.Input"
-      },
       {
         "name" : "invalidClass",
         "type" : "String",
@@ -51601,6 +51607,12 @@
   },
   "Roo.bootstrap.SecurePass" : {
     "props" : [
+      {
+        "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+        "type" : "String",
+        "desc" : "inputType",
+        "memberOf" : "Roo.bootstrap.Input"
+      },
       {
         "name" : "Label",
         "type" : "String/Object",
@@ -51781,12 +51793,6 @@
           "right"
         ]
       },
-      {
-        "name" : "inputType",
-        "type" : "String",
-        "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-        "memberOf" : "Roo.bootstrap.Input"
-      },
       {
         "name" : "invalidClass",
         "type" : "String",
@@ -56537,6 +56543,12 @@
   },
   "Roo.bootstrap.TextArea" : {
     "props" : [
+      {
+        "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+        "type" : "String",
+        "desc" : "inputType",
+        "memberOf" : "Roo.bootstrap.Input"
+      },
       {
         "name" : "accept",
         "type" : "String",
@@ -56717,12 +56729,6 @@
           "right"
         ]
       },
-      {
-        "name" : "inputType",
-        "type" : "String",
-        "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-        "memberOf" : "Roo.bootstrap.Input"
-      },
       {
         "name" : "invalidClass",
         "type" : "String",
@@ -57441,6 +57447,12 @@
   },
   "Roo.bootstrap.TimeField" : {
     "props" : [
+      {
+        "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+        "type" : "String",
+        "desc" : "inputType",
+        "memberOf" : "Roo.bootstrap.Input"
+      },
       {
         "name" : "accept",
         "type" : "String",
@@ -57615,12 +57627,6 @@
           "right"
         ]
       },
-      {
-        "name" : "inputType",
-        "type" : "String",
-        "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-        "memberOf" : "Roo.bootstrap.Input"
-      },
       {
         "name" : "invalidClass",
         "type" : "String",
@@ -58330,6 +58336,12 @@
   },
   "Roo.bootstrap.TriggerField" : {
     "props" : [
+      {
+        "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+        "type" : "String",
+        "desc" : "inputType",
+        "memberOf" : "Roo.bootstrap.Input"
+      },
       {
         "name" : "accept",
         "type" : "String",
@@ -58514,12 +58526,6 @@
           "right"
         ]
       },
-      {
-        "name" : "inputType",
-        "type" : "String",
-        "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-        "memberOf" : "Roo.bootstrap.Input"
-      },
       {
         "name" : "invalidClass",
         "type" : "String",

diff --git a/docs/src/Roo_bootstrap_Input.js.html b/docs/src/Roo_bootstrap_Input.js.html
index 645b683..56792e1 100644 (file)
--- a/docs/src/Roo_bootstrap_Input.js.html
+++ b/docs/src/Roo_bootstrap_Input.js.html
@@ -10,7 +10,7 @@
  * @extends Roo.bootstrap.Component
  * Bootstrap Input class
  * @cfg {Boolean} disabled is it disabled
- * @cfg {String} inputType button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text
+ * @cfg {String} (button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text) inputType 
  * @cfg {String} name name of the input
  * @cfg {string} fieldLabel - the label associated
  * @cfg {string} placeholder - placeholder to put in text.

diff --git a/docs/symbols/Roo.bootstrap.CheckBox.json b/docs/symbols/Roo.bootstrap.CheckBox.json
index 064bfc1..367c8ca 100644 (file)
--- a/docs/symbols/Roo.bootstrap.CheckBox.json
+++ b/docs/symbols/Roo.bootstrap.CheckBox.json
@@ -50,6 +50,13 @@
         "audio"
       ]
     },
+    {
+      "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+      "type" : "String",
+      "desc" : "inputType",
+      "memberOf" : "Roo.bootstrap.Input",
+      "optvals" : []
+    },
     {
       "name" : "xs",
       "type" : "Number",
@@ -311,16 +318,16 @@
       "optvals" : []
     },
     {
-      "name" : "validateOnBlur",
-      "type" : "Boolean",
-      "desc" : "Whether the field should validate when it loses focus (defaults to true).",
+      "name" : "labelxs",
+      "type" : "Number",
+      "desc" : "set the width of label (1-12)",
       "memberOf" : "Roo.bootstrap.Input",
       "optvals" : []
     },
     {
-      "name" : "labelxs",
-      "type" : "Number",
-      "desc" : "set the width of label (1-12)",
+      "name" : "validateOnBlur",
+      "type" : "Boolean",
+      "desc" : "Whether the field should validate when it loses focus (defaults to true).",
       "memberOf" : "Roo.bootstrap.Input",
       "optvals" : []
     },
@@ -331,13 +338,6 @@
       "memberOf" : "Roo.bootstrap.Component",
       "optvals" : []
     },
-    {
-      "name" : "inputType",
-      "type" : "String",
-      "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-      "memberOf" : "Roo.bootstrap.Input",
-      "optvals" : []
-    },
     {
       "name" : "invalidClass",
       "type" : "String",

diff --git a/docs/symbols/Roo.bootstrap.ComboBox.json b/docs/symbols/Roo.bootstrap.ComboBox.json
index a5ae568..97658d3 100644 (file)
--- a/docs/symbols/Roo.bootstrap.ComboBox.json
+++ b/docs/symbols/Roo.bootstrap.ComboBox.json
@@ -265,6 +265,13 @@
         "false"
       ]
     },
+    {
+      "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+      "type" : "String",
+      "desc" : "inputType",
+      "memberOf" : "Roo.bootstrap.Input",
+      "optvals" : []
+    },
     {
       "name" : "actionMode",
       "type" : "String",
@@ -607,13 +614,6 @@
       "memberOf" : "Roo.bootstrap.ComboBox",
       "optvals" : []
     },
-    {
-      "name" : "inputType",
-      "type" : "String",
-      "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-      "memberOf" : "Roo.bootstrap.Input",
-      "optvals" : []
-    },
     {
       "name" : "tooltip",
       "type" : "string",

diff --git a/docs/symbols/Roo.bootstrap.DateField.json b/docs/symbols/Roo.bootstrap.DateField.json
index fca08f7..c7a725a 100644 (file)
--- a/docs/symbols/Roo.bootstrap.DateField.json
+++ b/docs/symbols/Roo.bootstrap.DateField.json
@@ -50,6 +50,13 @@
         "audio"
       ]
     },
+    {
+      "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+      "type" : "String",
+      "desc" : "inputType",
+      "memberOf" : "Roo.bootstrap.Input",
+      "optvals" : []
+    },
     {
       "name" : "xs",
       "type" : "Number",
@@ -339,13 +346,6 @@
       "memberOf" : "Roo.bootstrap.DateField",
       "optvals" : []
     },
-    {
-      "name" : "inputType",
-      "type" : "String",
-      "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-      "memberOf" : "Roo.bootstrap.Input",
-      "optvals" : []
-    },
     {
       "name" : "invalidClass",
       "type" : "String",

diff --git a/docs/symbols/Roo.bootstrap.HtmlEditor.json b/docs/symbols/Roo.bootstrap.HtmlEditor.json
index 547abc6..e94d031 100644 (file)
--- a/docs/symbols/Roo.bootstrap.HtmlEditor.json
+++ b/docs/symbols/Roo.bootstrap.HtmlEditor.json
@@ -51,6 +51,13 @@
         "audio"
       ]
     },
+    {
+      "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+      "type" : "String",
+      "desc" : "inputType",
+      "memberOf" : "Roo.bootstrap.Input",
+      "optvals" : []
+    },
     {
       "name" : "xs",
       "type" : "Number",

diff --git a/docs/symbols/Roo.bootstrap.Input.json b/docs/symbols/Roo.bootstrap.Input.json
index 8979993..b6b4d44 100644 (file)
--- a/docs/symbols/Roo.bootstrap.Input.json
+++ b/docs/symbols/Roo.bootstrap.Input.json
@@ -49,6 +49,13 @@
         "audio"
       ]
     },
+    {
+      "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+      "type" : "String",
+      "desc" : "inputType",
+      "memberOf" : "Roo.bootstrap.Input",
+      "optvals" : []
+    },
     {
       "name" : "xs",
       "type" : "Number",
@@ -282,13 +289,6 @@
       "memberOf" : "Roo.bootstrap.Component",
       "optvals" : []
     },
-    {
-      "name" : "inputType",
-      "type" : "String",
-      "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-      "memberOf" : "Roo.bootstrap.Input",
-      "optvals" : []
-    },
     {
       "name" : "invalidClass",
       "type" : "String",

diff --git a/docs/symbols/Roo.bootstrap.MoneyField.json b/docs/symbols/Roo.bootstrap.MoneyField.json
index 944ed32..3ba79a1 100644 (file)
--- a/docs/symbols/Roo.bootstrap.MoneyField.json
+++ b/docs/symbols/Roo.bootstrap.MoneyField.json
@@ -311,6 +311,13 @@
         "false"
       ]
     },
+    {
+      "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+      "type" : "String",
+      "desc" : "inputType",
+      "memberOf" : "Roo.bootstrap.Input",
+      "optvals" : []
+    },
     {
       "name" : "actionMode",
       "type" : "String",
@@ -667,13 +674,6 @@
       "memberOf" : "Roo.bootstrap.ComboBox",
       "optvals" : []
     },
-    {
-      "name" : "inputType",
-      "type" : "String",
-      "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-      "memberOf" : "Roo.bootstrap.Input",
-      "optvals" : []
-    },
     {
       "name" : "tooltip",
       "type" : "string",

diff --git a/docs/symbols/Roo.bootstrap.MonthField.json b/docs/symbols/Roo.bootstrap.MonthField.json
index 2b32b51..6c59855 100644 (file)
--- a/docs/symbols/Roo.bootstrap.MonthField.json
+++ b/docs/symbols/Roo.bootstrap.MonthField.json
@@ -50,6 +50,13 @@
         "audio"
       ]
     },
+    {
+      "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+      "type" : "String",
+      "desc" : "inputType",
+      "memberOf" : "Roo.bootstrap.Input",
+      "optvals" : []
+    },
     {
       "name" : "xs",
       "type" : "Number",
@@ -290,13 +297,6 @@
       "memberOf" : "Roo.bootstrap.Component",
       "optvals" : []
     },
-    {
-      "name" : "inputType",
-      "type" : "String",
-      "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-      "memberOf" : "Roo.bootstrap.Input",
-      "optvals" : []
-    },
     {
       "name" : "validationEvent",
       "type" : "String/Boolean",

diff --git a/docs/symbols/Roo.bootstrap.NumberField.json b/docs/symbols/Roo.bootstrap.NumberField.json
index acb05c8..f9f8a15 100644 (file)
--- a/docs/symbols/Roo.bootstrap.NumberField.json
+++ b/docs/symbols/Roo.bootstrap.NumberField.json
@@ -50,6 +50,13 @@
         "audio"
       ]
     },
+    {
+      "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+      "type" : "String",
+      "desc" : "inputType",
+      "memberOf" : "Roo.bootstrap.Input",
+      "optvals" : []
+    },
     {
       "name" : "xs",
       "type" : "Number",
@@ -332,13 +339,6 @@
       "memberOf" : "Roo.bootstrap.Component",
       "optvals" : []
     },
-    {
-      "name" : "inputType",
-      "type" : "String",
-      "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-      "memberOf" : "Roo.bootstrap.Input",
-      "optvals" : []
-    },
     {
       "name" : "invalidClass",
       "type" : "String",

diff --git a/docs/symbols/Roo.bootstrap.PhoneInput.json b/docs/symbols/Roo.bootstrap.PhoneInput.json
index 1a6a2ef..196f824 100644 (file)
--- a/docs/symbols/Roo.bootstrap.PhoneInput.json
+++ b/docs/symbols/Roo.bootstrap.PhoneInput.json
@@ -58,6 +58,13 @@
         "audio"
       ]
     },
+    {
+      "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+      "type" : "String",
+      "desc" : "inputType",
+      "memberOf" : "Roo.bootstrap.Input",
+      "optvals" : []
+    },
     {
       "name" : "xs",
       "type" : "Number",
@@ -250,16 +257,16 @@
       ]
     },
     {
-      "name" : "focusClass",
-      "type" : "String",
-      "desc" : "The CSS class to use when the field receives focus (defaults to \"x-form-focus\")",
+      "name" : "size",
+      "type" : "string",
+      "desc" : "- (lg|sm) or leave empty..",
       "memberOf" : "Roo.bootstrap.Input",
       "optvals" : []
     },
     {
-      "name" : "size",
-      "type" : "string",
-      "desc" : "- (lg|sm) or leave empty..",
+      "name" : "focusClass",
+      "type" : "String",
+      "desc" : "The CSS class to use when the field receives focus (defaults to \"x-form-focus\")",
       "memberOf" : "Roo.bootstrap.Input",
       "optvals" : []
     },
@@ -318,13 +325,6 @@
         "calendar"
       ]
     },
-    {
-      "name" : "inputType",
-      "type" : "String",
-      "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-      "memberOf" : "Roo.bootstrap.Input",
-      "optvals" : []
-    },
     {
       "name" : "invalidClass",
       "type" : "String",

diff --git a/docs/symbols/Roo.bootstrap.RadioSet.json b/docs/symbols/Roo.bootstrap.RadioSet.json
index 3e05b44..26cf231 100644 (file)
--- a/docs/symbols/Roo.bootstrap.RadioSet.json
+++ b/docs/symbols/Roo.bootstrap.RadioSet.json
@@ -50,6 +50,13 @@
         "audio"
       ]
     },
+    {
+      "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+      "type" : "String",
+      "desc" : "inputType",
+      "memberOf" : "Roo.bootstrap.Input",
+      "optvals" : []
+    },
     {
       "name" : "xs",
       "type" : "Number",
@@ -306,13 +313,6 @@
       "memberOf" : "Roo.bootstrap.Component",
       "optvals" : []
     },
-    {
-      "name" : "inputType",
-      "type" : "String",
-      "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-      "memberOf" : "Roo.bootstrap.Input",
-      "optvals" : []
-    },
     {
       "name" : "invalidClass",
       "type" : "String",

diff --git a/docs/symbols/Roo.bootstrap.SecurePass.json b/docs/symbols/Roo.bootstrap.SecurePass.json
index f558d59..411d9b6 100644 (file)
--- a/docs/symbols/Roo.bootstrap.SecurePass.json
+++ b/docs/symbols/Roo.bootstrap.SecurePass.json
@@ -50,6 +50,13 @@
         "audio"
       ]
     },
+    {
+      "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+      "type" : "String",
+      "desc" : "inputType",
+      "memberOf" : "Roo.bootstrap.Input",
+      "optvals" : []
+    },
     {
       "name" : "xs",
       "type" : "Number",
@@ -256,16 +263,16 @@
       ]
     },
     {
-      "name" : "size",
-      "type" : "string",
-      "desc" : "- (lg|sm) or leave empty..",
+      "name" : "focusClass",
+      "type" : "String",
+      "desc" : "The CSS class to use when the field receives focus (defaults to \"x-form-focus\")",
       "memberOf" : "Roo.bootstrap.Input",
       "optvals" : []
     },
     {
-      "name" : "focusClass",
-      "type" : "String",
-      "desc" : "The CSS class to use when the field receives focus (defaults to \"x-form-focus\")",
+      "name" : "size",
+      "type" : "string",
+      "desc" : "- (lg|sm) or leave empty..",
       "memberOf" : "Roo.bootstrap.Input",
       "optvals" : []
     },
@@ -297,13 +304,6 @@
       "memberOf" : "Roo.bootstrap.Component",
       "optvals" : []
     },
-    {
-      "name" : "inputType",
-      "type" : "String",
-      "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-      "memberOf" : "Roo.bootstrap.Input",
-      "optvals" : []
-    },
     {
       "name" : "invalidClass",
       "type" : "String",

diff --git a/docs/symbols/Roo.bootstrap.TextArea.json b/docs/symbols/Roo.bootstrap.TextArea.json
index 2c201af..1a253f3 100644 (file)
--- a/docs/symbols/Roo.bootstrap.TextArea.json
+++ b/docs/symbols/Roo.bootstrap.TextArea.json
@@ -50,6 +50,13 @@
         "audio"
       ]
     },
+    {
+      "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+      "type" : "String",
+      "desc" : "inputType",
+      "memberOf" : "Roo.bootstrap.Input",
+      "optvals" : []
+    },
     {
       "name" : "xs",
       "type" : "Number",
@@ -300,13 +307,6 @@
       "memberOf" : "Roo.bootstrap.Component",
       "optvals" : []
     },
-    {
-      "name" : "inputType",
-      "type" : "String",
-      "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-      "memberOf" : "Roo.bootstrap.Input",
-      "optvals" : []
-    },
     {
       "name" : "invalidClass",
       "type" : "String",

diff --git a/docs/symbols/Roo.bootstrap.TimeField.json b/docs/symbols/Roo.bootstrap.TimeField.json
index da0386e..452279f 100644 (file)
--- a/docs/symbols/Roo.bootstrap.TimeField.json
+++ b/docs/symbols/Roo.bootstrap.TimeField.json
@@ -50,6 +50,13 @@
         "audio"
       ]
     },
+    {
+      "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+      "type" : "String",
+      "desc" : "inputType",
+      "memberOf" : "Roo.bootstrap.Input",
+      "optvals" : []
+    },
     {
       "name" : "xs",
       "type" : "Number",
@@ -283,13 +290,6 @@
       "memberOf" : "Roo.bootstrap.Component",
       "optvals" : []
     },
-    {
-      "name" : "inputType",
-      "type" : "String",
-      "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-      "memberOf" : "Roo.bootstrap.Input",
-      "optvals" : []
-    },
     {
       "name" : "validationEvent",
       "type" : "String/Boolean",

diff --git a/docs/symbols/Roo.bootstrap.TriggerField.json b/docs/symbols/Roo.bootstrap.TriggerField.json
index 35844c4..d531992 100644 (file)
--- a/docs/symbols/Roo.bootstrap.TriggerField.json
+++ b/docs/symbols/Roo.bootstrap.TriggerField.json
@@ -57,6 +57,13 @@
         "audio"
       ]
     },
+    {
+      "name" : "(button|checkbox|email|file|hidden|image|number|password|radio|range|reset|search|submit|text)",
+      "type" : "String",
+      "desc" : "inputType",
+      "memberOf" : "Roo.bootstrap.Input",
+      "optvals" : []
+    },
     {
       "name" : "xs",
       "type" : "Number",
@@ -317,13 +324,6 @@
         "calendar"
       ]
     },
-    {
-      "name" : "inputType",
-      "type" : "String",
-      "desc" : "button | checkbox | email | file | hidden | image | number | password | radio | range | reset | search | submit | text",
-      "memberOf" : "Roo.bootstrap.Input",
-      "optvals" : []
-    },
     {
       "name" : "invalidClass",
       "type" : "String",

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 9047f34..c49a468 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -1326,8 +1326,8 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
      */
     toggleActive : function(e)
     {
-        this.setActive(!this.pressed);
-        this.fireEvent('toggle', this, e, !this.pressed);
+        this.setActive(!this.pressed); // this modifies pressed...
+        this.fireEvent('toggle', this, e, this.pressed);
     },
      /**
      * get the current active state
@@ -1950,11 +1950,13 @@ Roo.bootstrap.Card = function(config){
         /**
          * @event drop
          * When a element a card is dropped
-         * @param {Roo.bootstrap.Element} this
-         * @param {Roo.Element} n the node being dropped?
-         * @param {Object} dd Drag and drop data
-         * @param {Roo.EventObject} e
-         * @param {Roo.EventObject} data  the data passed via getDragData
+         * @param {Roo.bootstrap.Card} this
+         *
+         * 
+         * @param {Roo.bootstrap.Card} move_card the card being dropped?
+         * @param {String} position 'above' or 'below'
+         * @param {Roo.bootstrap.Card} next_to_card What card position is relative to of 'false' for empty list.
+        
          */
         'drop' : true,
          /**
@@ -2425,13 +2427,18 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component,  {
         if (info === false) {
             return false;
         }
-        
+        this.dropPlaceHolder('hide');
+  
         if (this.fireEvent("drop", this, n, dd, e, data) === false) {
             return false;
         }
          
-        this.dropPlaceHolder('hide');
-        
+    
+    
+    
+        this.acceptCard(data.source, info.position, info.card, info.items_n);
+        return true;
+        /*
         // do the dom manipulation first..
         var dom = data.source.el.dom;
         dom.parentNode.removeChild(dom);
@@ -2485,7 +2492,90 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component,  {
         data.source.parentId = this.id;
         
         return true;
+        */
+    },
+    firstChildCard : function()
+    {
+        for (var i = 0;i< this.items.length;i++) {
+            
+            if (!this.items[i].el.hasClass('card')) {
+                 continue;
+            }
+            return this.items[i];
+        }
+        return this.items.length ? this.items[this.items.length-1] : false; // don't try and put stuff after the cards...
     },
+    /**
+     * accept card
+     *
+     * -        card.acceptCard(move_card, info.position, info.card, info.items_n);
+
+     */
+    acceptCard : function(move_card,  position, next_to_card )
+    {
+        if (this.fireEvent("drop", this, move_card, position, next_to_card) === false) {
+            return false;
+        }
+        
+        var to_items_n = next_to_card ? this.items.indexOf(next_to_card) : true;
+        
+        
+        var dom = move_card.el.dom;
+        dom.parentNode.removeChild(dom);
+        
+        
+        if (next_to_card !== true) {
+            var cardel = next_to_card.el.dom;
+            
+            if (position == 'above') {
+                cardel.parentNode.insertBefore(dom, cardel);
+            } else if (cardel.nextSibling) {
+                cardel.parentNode.insertBefore(dom,cardel.nextSibling);
+            } else {
+                cardel.parentNode.append(dom);
+            }
+        } else {
+            // card container???
+            this.bodyEl.dom.append(dom);
+        }
+        
+        //FIXME HANDLE card = true 
+        
+        // add this to the correct place in items.
+        
+        
+        
+        // remove Card from items.
+        
+        var old_parent = move_card.parent();
+        
+        old_parent.items = old_parent.items.filter(function(e) { return e != move_card });
+        
+        if (this.items.length) {
+            var nitems = [];
+            //Roo.log([info.items_n, info.position, this.items.length]);
+            for (var i =0; i < this.items.length; i++) {
+                if (i == to_items_n && position == 'above') {
+                    nitems.push(move_card);
+                }
+                nitems.push(this.items[i]);
+                if (i == to_items_n && position == 'below') {
+                    nitems.push(move_card);
+                }
+            }
+            this.items = nitems;
+            Roo.log(this.items);
+        } else {
+            this.items.push(move_card);
+        }
+        
+        move_card.parentId = this.id;
+        
+        return true;
+        
+        
+    },
+    
     
     /**    Decide whether to drop above or below a View node. */
     getDropPoint : function(e, n, dd)

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 6c04323..156226d 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -53,7 +53,7 @@ A.tag='ul';this.glyphicon='caret';if(Roo.bootstrap.version==4){this.fa='caret-do
 }if(A.tag!=='a'&&this.href!==''){throw "Tag must be a to set href.";}else if(this.href.length>0){A.href=this.href;}if(this.removeClass){A.cls='';}if(this.target){A.target=this.target;}return A;},initEvents:function(){if(typeof(this.menu)!='undefined'){this.menu.parentType=this.xtype;
 this.menu.triggerEl=this.el;this.addxtype(Roo.apply({},this.menu));}if(this.el.hasClass('roo-button')){this.el.on('click',this.onClick,this);}else{this.el.select('.roo-button').on('click',this.onClick,this);}if(this.removeClass){this.el.on('click',this.onClick,this);
 }this.el.enableDisplayMode();},onClick:function(e){if(this.disabled){return;}Roo.log('button on click ');if(this.preventDefault){e.preventDefault();}if(this.pressed===true||this.pressed===false){this.toggleActive(e);}this.fireEvent('click',this,e);},enable:function(){this.disabled=false;
-this.el.removeClass('disabled');},disable:function(){this.disabled=true;this.el.addClass('disabled');},setActive:function(v){this.el[v?'addClass':'removeClass']('active');this.pressed=v;},toggleActive:function(e){this.setActive(!this.pressed);this.fireEvent('toggle',this,e,!this.pressed);
+this.el.removeClass('disabled');},disable:function(){this.disabled=true;this.el.addClass('disabled');},setActive:function(v){this.el[v?'addClass':'removeClass']('active');this.pressed=v;},toggleActive:function(e){this.setActive(!this.pressed);this.fireEvent('toggle',this,e,this.pressed);
 },isActive:function(){return this.el.hasClass('active');},setText:function(A){this.el.select('.roo-button-text',true).first().dom.innerHTML=A;},getText:function(){return this.el.select('.roo-button-text',true).first().dom.innerHTML;},setWeight:function(A){this.el.removeClass(Roo.bootstrap.Button.weights.map(function(w){return 'btn-'+w;
 }));this.el.removeClass(Roo.bootstrap.Button.weights.map(function(w){return 'btn-outline-'+w;}));this.weight=A;var B=this.outline?'outline-':'';if(A=='default'){this.el.addClass('btn-default btn-outline-secondary');return;}this.el.addClass('btn-'+B+A);}});
 Roo.bootstrap.Button.weights=['default','secondary','primary','success','info','warning','danger','link','light','dark'];
@@ -98,9 +98,10 @@ this.headerEl=this.el.select('.roo-card-header-ctr').first();if(this.rotated){th
 C.items_n=i>0?i-1:0;C.card_n=F>0?F-1:0;C.card=C.cards[C.card_n];}}if(!C.cards.length){C.card=true;C.position='below';C.items_n;return C;}if(C.card_n<0){C.card_n=E;C.card=C.cards[E];C.items_n=this.items.indexOf(C.cards[E]);C.position='below';}if(this.items[C.items_n].el==A){return false;
 }if(C.position=='below'){var G=C.card_n+1==C.cards.length?false:C.cards[C.card_n+1];if(G&&G.el==A){return false;}return C;}var H=C.card_n>0?C.cards[C.card_n-1]:false;if(H&&H.el==A){return false;}return C;},onNodeEnter:function(n,dd,e,A){return false;},onNodeOver:function(n,dd,e,A){var B=this.getTargetFromEvent(e,A.source.el);
 if(B===false){this.dropPlaceHolder('hide');return false;}Roo.log(['getTargetFromEvent',B]);this.dropPlaceHolder('show',B,A);return false;},onNodeOut:function(n,dd,e,A){this.dropPlaceHolder('hide');},onNodeDrop:function(n,dd,e,A){var B=this.getTargetFromEvent(e,A.source.el);
-if(B===false){return false;}if(this.fireEvent("drop",this,n,dd,e,A)===false){return false;}this.dropPlaceHolder('hide');var C=A.source.el.dom;C.parentNode.removeChild(C);if(B.card!==true){var D=B.card.el.dom;if(B.position=='above'){D.parentNode.insertBefore(C,D);
-}else if(D.nextSibling){D.parentNode.insertBefore(C,D.nextSibling);}else{D.parentNode.append(C);}}else{this.bodyEl.dom.append(C);}var E=A.source.parent();E.items=E.items.filter(function(e){return e!=A.source});if(this.items.length){var F=[];for(var i=0;i<this.items.length;
-i++){if(i==B.items_n&&B.position=='above'){F.push(A.source);}F.push(this.items[i]);if(i==B.items_n&&B.position=='below'){F.push(A.source);}}this.items=F;Roo.log(this.items);}else{this.items.push(A.source);}A.source.parentId=this.id;return true;},getDropPoint:function(e,n,dd){if(dd){return false;
+if(B===false){return false;}this.dropPlaceHolder('hide');if(this.fireEvent("drop",this,n,dd,e,A)===false){return false;}this.acceptCard(A.source,B.position,B.card,B.items_n);return true;},firstChildCard:function(){for(var i=0;i<this.items.length;i++){if(!this.items[i].el.hasClass('card')){continue;
+}return this.items[i];}return this.items.length?this.items[this.items.length-1]:false;},acceptCard:function(A,B,C){if(this.fireEvent("drop",this,A,B,C)===false){return false;}var D=C?this.items.indexOf(C):true;var E=A.el.dom;E.parentNode.removeChild(E);if(C!==true){var F=C.el.dom;
+if(B=='above'){F.parentNode.insertBefore(E,F);}else if(F.nextSibling){F.parentNode.insertBefore(E,F.nextSibling);}else{F.parentNode.append(E);}}else{this.bodyEl.dom.append(E);}var G=A.parent();G.items=G.items.filter(function(e){return e!=A});if(this.items.length){var H=[];
+for(var i=0;i<this.items.length;i++){if(i==D&&B=='above'){H.push(A);}H.push(this.items[i]);if(i==D&&B=='below'){H.push(A);}}this.items=H;Roo.log(this.items);}else{this.items.push(A);}A.parentId=this.id;return true;},getDropPoint:function(e,n,dd){if(dd){return false;
 }if(n==this.bodyEl.dom){return "above";}var t=Roo.lib.Dom.getY(n),b=t+n.offsetHeight;var c=t+(b-t)/2;var y=Roo.lib.Event.getPageY(e);if(y<=c){return "above";}else{return "below";}},onToggleCollapse:function(e){if(this.collapsed){this.el.select('.roo-collapse-toggle').removeClass('collapsed');
 this.collapsableEl.addClass('show');this.collapsed=false;return;}this.el.select('.roo-collapse-toggle').addClass('collapsed');this.collapsableEl.removeClass('show');this.collapsed=true;},onToggleRotate:function(e){this.collapsableEl.removeClass('show');this.footerEl.removeClass('d-none');
 this.el.removeClass('roo-card-rotated');this.el.removeClass('d-none');if(this.rotated){this.collapsableEl.addClass('show');this.rotated=false;this.fireEvent('rotate',this,this.rotated);return;}this.el.addClass('roo-card-rotated');this.footerEl.addClass('d-none');