sync

[roojs1] / Roo / bootstrap / TabGroup.js

diff --git a/Roo/bootstrap/TabGroup.js b/Roo/bootstrap/TabGroup.js
index 6f5ae0e..ea85838 100644 (file)
--- a/Roo/bootstrap/TabGroup.js
+++ b/Roo/bootstrap/TabGroup.js
@@ -1,13 +1,7 @@
-/*
- * - LGPL
- *
- * column
- * 
- */
-
 /**
  * @class Roo.bootstrap.TabGroup
  * @extends Roo.bootstrap.Column
+ * @children Roo.bootstrap.TabPanel
  * Bootstrap Column class
  * @cfg {String} navId the navigation id (for use with navbars) - will be auto generated if it does not exist..
  * @cfg {Boolean} carousel true to make the group behave like a carousel
@@ -139,35 +133,6 @@ Roo.extend(Roo.bootstrap.TabGroup, Roo.bootstrap.Column,  {
 //        this.showPanelNext();
 //    },
     
-    onTouchStart : function(e)
-    {
-        e.preventDefault();
-        
-        Roo.log('on touch start');
-        
-        Roo.log(e);
-        
-        Roo.log(e.browserEvent.touches[0].clientX);
-    },
-    
-    onTouchMove : function(e)
-    {
-        e.preventDefault();
-        
-        Roo.log('on touch move');
-        
-        Roo.log(e);
-    },
-    
-    onTouchEnd : function(e)
-    {
-        e.preventDefault();
-        
-        Roo.log('on touch end');
-        
-        Roo.log(e);
-        
-    },
     
     getChildContainer : function()
     {
@@ -232,7 +197,7 @@ Roo.extend(Roo.bootstrap.TabGroup, Roo.bootstrap.Column,  {
     {
         if(this.transition || typeof(pan) == 'undefined'){
             Roo.log("waiting for the transitionend");
-            return;
+            return false;
         }
         
         if (typeof(pan) == 'number') {
@@ -264,22 +229,28 @@ Roo.extend(Roo.bootstrap.TabGroup, Roo.bootstrap.Column,  {
         
         if (this.carousel && typeof(Roo.get(document.body).dom.style.transition) != 'undefined') {
             
+            //class="carousel-item carousel-item-next carousel-item-left"
+            
             this.transition = true;
             var dir = this.indexOfPanel(pan) > this.indexOfPanel(cur)  ? 'next' : 'prev';
             var lr = dir == 'next' ? 'left' : 'right';
             pan.el.addClass(dir); // or prev
+            pan.el.addClass('carousel-item-' + dir); // or prev
             pan.el.dom.offsetWidth; // find the offset with - causing a reflow?
             cur.el.addClass(lr); // or right
             pan.el.addClass(lr);
+            cur.el.addClass('carousel-item-' +lr); // or right
+            pan.el.addClass('carousel-item-' +lr);
+            
             
             var _this = this;
             cur.el.on('transitionend', function() {
                 Roo.log("trans end?");
                 
-                pan.el.removeClass([lr,dir]);
+                pan.el.removeClass([lr,dir, 'carousel-item-' + lr, 'carousel-item-' + dir]);
                 pan.setActive(true);
                 
-                cur.el.removeClass([lr]);
+                cur.el.removeClass([lr, 'carousel-item-' + lr]);
                 cur.setActive(false);
                 
                 _this.transition = false;