From d7b62e4ac38f0935be73f874d48de23076b48b3f Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 28 Dec 2020 13:52:12 +0800 Subject: [PATCH] roojs-bootstrap.js roojs-bootstrap-debug.js --- roojs-bootstrap-debug.js | 2 +- roojs-bootstrap.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 64b3068f0d..04873dbb8f 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -20359,7 +20359,7 @@ Roo.extend(Roo.bootstrap.TabPanel, Roo.bootstrap.Component, { this.el.on('click', this.onClick, this); - if(Roo.isTouch){ + if(Roo.isTouch && this.touchSlide){ this.el.on("touchstart", this.onTouchStart, this); this.el.on("touchmove", this.onTouchMove, this); this.el.on("touchend", this.onTouchEnd, this); diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 04577f7342..ff2f8140d5 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -841,7 +841,7 @@ B.on('click',(function(e,el,o,ii,t){e.preventDefault();this.showPanel(ii);if(thi // Roo/bootstrap/TabPanel.js Roo.bootstrap.TabPanel=function(A){Roo.bootstrap.TabPanel.superclass.constructor.call(this,A);this.addEvents({'changed':true,'beforedeactivate':true});this.tabId=this.tabId||Roo.id();};Roo.extend(Roo.bootstrap.TabPanel,Roo.bootstrap.Component,{active:false,html:false,tabId:false,navId:false,href:'',getAutoCreate:function(){var A={tag:'div',cls:'carousel-item tab-pane item'+((this.href.length)?' clickable ':''),html:this.html||''} ;if(this.active){A.cls+=' active';}if(this.tabId){A.tabId=this.tabId;}return A;},initEvents:function(){var p=this.parent();this.navId=this.navId||p.navId;if(typeof(this.navId)!='undefined'){var tg=Roo.bootstrap.TabGroup.get(this.navId);tg.register(this);var i=tg.tabs.length-1; -if(this.active&&tg.bullets>0&&i0&&i