sync

diff --git a/docs/json/roodata.json b/docs/json/roodata.json
index bde42b6..240b34b 100644 (file)
--- a/docs/json/roodata.json
+++ b/docs/json/roodata.json
@@ -54767,6 +54767,12 @@
         "desc" : "Text for the tooltip",
         "memberOf" : "Roo.bootstrap.Component"
       },
+      {
+        "name" : "touchSlide",
+        "type" : "Boolean",
+        "desc" : "if swiping slides tab to next panel (default off)",
+        "memberOf" : ""
+      },
       {
         "name" : "visibilityEl",
         "type" : "string|object",

diff --git a/docs/src/Roo_bootstrap_ComboBox.js.html b/docs/src/Roo_bootstrap_ComboBox.js.html
index 58db88f..223da32 100644 (file)
--- a/docs/src/Roo_bootstrap_ComboBox.js.html
+++ b/docs/src/Roo_bootstrap_ComboBox.js.html
@@ -2592,9 +2592,9 @@
 
         </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.animate</span><span class="jsdoc-syntax">){
             </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">_this </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this</span><span class="jsdoc-syntax">;
-            (</span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(){ </span><span class="jsdoc-var">_this.touchViewEl.addClass</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'in'</span><span class="jsdoc-syntax">); })</span><span class="jsdoc-var">.defer</span><span class="jsdoc-syntax">(50);
+            (</span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(){ </span><span class="jsdoc-var">_this.touchViewEl.addClass</span><span class="jsdoc-syntax">([</span><span class="jsdoc-string">'in'</span><span class="jsdoc-syntax">,</span><span class="jsdoc-string">'show'</span><span class="jsdoc-syntax">]); })</span><span class="jsdoc-var">.defer</span><span class="jsdoc-syntax">(50);
         }</span><span class="jsdoc-keyword">else</span><span class="jsdoc-syntax">{
-            </span><span class="jsdoc-var">this.touchViewEl.addClass</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'in'</span><span class="jsdoc-syntax">);
+            </span><span class="jsdoc-var">this.touchViewEl.addClass</span><span class="jsdoc-syntax">([</span><span class="jsdoc-string">'in'</span><span class="jsdoc-syntax">,</span><span class="jsdoc-string">'show'</span><span class="jsdoc-syntax">]);
         }
 
         </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this._touchViewMask</span><span class="jsdoc-syntax">){
@@ -2610,7 +2610,7 @@
 
     </span><span class="jsdoc-var">hideTouchView </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">()
     {
-        </span><span class="jsdoc-var">this.touchViewEl.removeClass</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'in'</span><span class="jsdoc-syntax">);
+        </span><span class="jsdoc-var">this.touchViewEl.removeClass</span><span class="jsdoc-syntax">([</span><span class="jsdoc-string">'in'</span><span class="jsdoc-syntax">,</span><span class="jsdoc-string">'show'</span><span class="jsdoc-syntax">]);
 
         </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.animate</span><span class="jsdoc-syntax">){
             </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">_this </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this</span><span class="jsdoc-syntax">;

diff --git a/docs/src/Roo_bootstrap_TabPanel.js.html b/docs/src/Roo_bootstrap_TabPanel.js.html
index 86af5ee..2f1bbe1 100644 (file)
--- a/docs/src/Roo_bootstrap_TabPanel.js.html
+++ b/docs/src/Roo_bootstrap_TabPanel.js.html
@@ -14,6 +14,7 @@
  * @cfg {String} tabId  unique tab ID (will be autogenerated if not set. - used to match TabItem to Panel)
  * @cfg {String} navId The Roo.bootstrap.NavGroup which triggers show hide ()
  * @cfg {String} href click to link..
+ * @cfg {Boolean} touchSlide if swiping slides tab to next panel (default off)
  * 
  * 
  * @constructor
@@ -53,7 +54,7 @@
     </span><span class="jsdoc-var">tabId</span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">false</span><span class="jsdoc-syntax">,
     </span><span class="jsdoc-var">navId </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">false</span><span class="jsdoc-syntax">,
     </span><span class="jsdoc-var">href </span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">''</span><span class="jsdoc-syntax">,
-
+    </span><span class="jsdoc-var">touchSlide </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">false</span><span class="jsdoc-syntax">,
     </span><span class="jsdoc-var">getAutoCreate </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(){
 
 
@@ -98,7 +99,7 @@
 
         </span><span class="jsdoc-var">this.el.on</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'click'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">this.onClick</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">Roo.isTouch</span><span class="jsdoc-syntax">){
+        </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">Roo.isTouch </span><span class="jsdoc-syntax">&amp;&amp; </span><span class="jsdoc-var">this.touchSlide</span><span class="jsdoc-syntax">){
             </span><span class="jsdoc-var">this.el.on</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">&quot;touchstart&quot;</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">this.onTouchStart</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">this</span><span class="jsdoc-syntax">);
             </span><span class="jsdoc-var">this.el.on</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">&quot;touchmove&quot;</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">this.onTouchMove</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">this</span><span class="jsdoc-syntax">);
             </span><span class="jsdoc-var">this.el.on</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">&quot;touchend&quot;</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">this.onTouchEnd</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">this</span><span class="jsdoc-syntax">);

diff --git a/docs/symbols/Roo.bootstrap.TabPanel.json b/docs/symbols/Roo.bootstrap.TabPanel.json
index 1385015..9dc1ac2 100644 (file)
--- a/docs/symbols/Roo.bootstrap.TabPanel.json
+++ b/docs/symbols/Roo.bootstrap.TabPanel.json
@@ -162,6 +162,13 @@
       "desc" : "click to link..",
       "memberOf" : "Roo.bootstrap.TabPanel",
       "optvals" : []
+    },
+    {
+      "name" : "touchSlide",
+      "type" : "Boolean",
+      "desc" : "if swiping slides tab to next panel (default off)",
+      "memberOf" : "Roo.bootstrap.TabPanel",
+      "optvals" : []
     }
   ],
   "methods" : [