make sure all transitons are done for expand before doing contract

googlearchive · Aug 18, 2014 · 4c42c4b · 4c42c4b
1 parent dacf7c3
commit 4c42c4b
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/paper-tabs.html b/paper-tabs.html
@@ -102,15 +102,18 @@
       this.$.selectionBar.classList.add('expand');
       if (old < this.selectedIndex) {
         s.width = w + w * (this.selectedIndex - old) - m + '%';
+        this._transitionCounter = 1;
       } else {
         s.width = w + w * (old - this.selectedIndex) - m + '%';
         s.left = this.selectedIndex * w + m + '%';
+        this._transitionCounter = 2;
       }
     },
 
-    barTransitionEnd: function() {
+    barTransitionEnd: function(e) {
+      this._transitionCounter--;
       var cl = this.$.selectionBar.classList;
-      if (cl.contains('expand')) {
+      if (cl.contains('expand') && !this._transitionCounter) {
         cl.remove('expand');
         cl.add('contract');
         var s = this.$.selectionBar.style;