From a02db6d5e9f6dc960a2949010401fb8a94ac75cb Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Mon, 2 Dec 2013 14:07:48 -0700 Subject: [PATCH 1/6] Eliminate idQueue property from filterSrv and querySrv. Replace with binary search for smallest id. Closes #730. Closes #739 --- src/app/components/kbn.js | 20 ++++++++++++++++++++ src/app/services/filterSrv.js | 15 +++++++-------- src/app/services/querySrv.js | 16 +++++++--------- 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/app/components/kbn.js b/src/app/components/kbn.js index 7d8efef2e43..8a7bb392b74 100644 --- a/src/app/components/kbn.js +++ b/src/app/components/kbn.js @@ -479,6 +479,26 @@ function($, _, moment) { }); }; + // Find the smallest missing number in an array + kbn.smallestMissing = function(arr,start,end) { + start = start || 0; + end = end || arr.length-1; + + if(start > end) { + return end + 1; + } + if(start !== arr[start]) { + return start; + } + var middle = Math.floor((start + end) / 2); + + if (arr[middle] > middle) { + return kbn.smallestMissing(arr, start, middle); + } else { + return kbn.smallestMissing(arr, middle + 1, end); + } + }; + kbn.byteFormat = function(size, decimals) { var ext, steps = 0; decimals = decimals || 2; diff --git a/src/app/services/filterSrv.js b/src/app/services/filterSrv.js index e5def56bb2b..fa25390083d 100644 --- a/src/app/services/filterSrv.js +++ b/src/app/services/filterSrv.js @@ -14,14 +14,12 @@ define([ // Defaults for it var _d = { - idQueue : [], list : {}, ids : [] }; // For convenience var ejs = ejsResource(config.elasticsearch); - var _f = dashboard.current.services.filter; // Save a reference to this var self = this; @@ -34,7 +32,6 @@ define([ // Accessors self.list = dashboard.current.services.filter.list; self.ids = dashboard.current.services.filter.ids; - _f = dashboard.current.services.filter; _.each(self.list,function(f) { self.set(f,f.id,true); @@ -97,8 +94,6 @@ define([ delete self.list[id]; // This must happen on the full path also since _.without returns a copy self.ids = dashboard.current.services.filter.ids = _.without(self.ids,id); - _f.idQueue.unshift(id); - _f.idQueue.sort(function(v,k){return v-k;}); _r = true; } else { _r = false; @@ -230,10 +225,14 @@ define([ }; var nextId = function() { - if(_f.idQueue.length > 0) { - return _f.idQueue.shift(); + var idCount = dashboard.current.services.filter.ids.length; + if(idCount > 0) { + // Make a sorted copy of the ids array + var ids = _.clone(dashboard.current.services.filter.ids).sort(); + return kbn.smallestMissing(ids); } else { - return self.ids.length; + // No ids currently in list + return 0; } }; diff --git a/src/app/services/querySrv.js b/src/app/services/querySrv.js index 3b0b447d1d1..9cd6829c259 100644 --- a/src/app/services/querySrv.js +++ b/src/app/services/querySrv.js @@ -14,7 +14,6 @@ function (angular, _, config, kbn) { // Create an object to hold our service state on the dashboard dashboard.current.services.query = dashboard.current.services.query || {}; _.defaults(dashboard.current.services.query,{ - idQueue : [], list : {}, ids : [], }); @@ -31,7 +30,6 @@ function (angular, _, config, kbn) { // For convenience var ejs = ejsResource(config.elasticsearch); - var _q = dashboard.current.services.query; // Holds all actual queries, including all resolved abstract queries var resolvedQueries = []; @@ -176,10 +174,6 @@ function (angular, _, config, kbn) { delete self.list[id]; // This must happen on the full path also since _.without returns a copy self.ids = dashboard.current.services.query.ids = _.without(self.ids,id); - _q.idQueue.unshift(id); - _q.idQueue.sort(function(v,k){ - return v-k; - }); return true; } else { return false; @@ -246,10 +240,14 @@ function (angular, _, config, kbn) { }; var nextId = function() { - if(_q.idQueue.length > 0) { - return _q.idQueue.shift(); + var idCount = dashboard.current.services.query.ids.length; + if(idCount > 0) { + // Make a sorted copy of the ids array + var ids = _.clone(dashboard.current.services.query.ids).sort(); + return kbn.smallestMissing(ids); } else { - return self.ids.length; + // No ids currently in list + return 0; } }; From 3fe94734f45e88763d3c8c281af8fe15c094ddd4 Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Mon, 2 Dec 2013 14:08:32 -0700 Subject: [PATCH 2/6] Remove idQueue from filter and query services in dashboards --- src/app/dashboards/blank.json | 11 ----------- src/app/dashboards/default.json | 11 ----------- src/app/dashboards/guided.json | 11 ----------- src/app/dashboards/logstash.json | 6 ------ src/app/dashboards/noted.json | 11 ----------- 5 files changed, 50 deletions(-) diff --git a/src/app/dashboards/blank.json b/src/app/dashboards/blank.json index 14a601da7af..f73ee1fc5a9 100644 --- a/src/app/dashboards/blank.json +++ b/src/app/dashboards/blank.json @@ -2,12 +2,6 @@ "title": "New Dashboard", "services": { "query": { - "idQueue": [ - 1, - 2, - 3, - 4 - ], "list": { "0": { "query": "*", @@ -21,11 +15,6 @@ ] }, "filter": { - "idQueue": [ - 0, - 1, - 2 - ], "list": {}, "ids": [] } diff --git a/src/app/dashboards/default.json b/src/app/dashboards/default.json index a0d31cc1c25..5a5bc905735 100644 --- a/src/app/dashboards/default.json +++ b/src/app/dashboards/default.json @@ -2,12 +2,6 @@ "title": "Introduction", "services": { "query": { - "idQueue": [ - 1, - 2, - 3, - 4 - ], "list": { "0": { "query": "*", @@ -23,11 +17,6 @@ ] }, "filter": { - "idQueue": [ - 0, - 1, - 2 - ], "list": {}, "ids": [] } diff --git a/src/app/dashboards/guided.json b/src/app/dashboards/guided.json index 13114ab450e..eabb77f9db9 100644 --- a/src/app/dashboards/guided.json +++ b/src/app/dashboards/guided.json @@ -2,12 +2,6 @@ "title": "Your Basic Dashboard", "services": { "query": { - "idQueue": [ - 1, - 2, - 3, - 4 - ], "list": { "0": { "query": "*", @@ -23,11 +17,6 @@ ] }, "filter": { - "idQueue": [ - 0, - 1, - 2 - ], "list": {}, "ids": [] } diff --git a/src/app/dashboards/logstash.json b/src/app/dashboards/logstash.json index 15ed4cf4eac..9bd1aac1550 100644 --- a/src/app/dashboards/logstash.json +++ b/src/app/dashboards/logstash.json @@ -2,9 +2,6 @@ "title": "Logstash Search", "services": { "query": { - "idQueue": [ - 1 - ], "list": { "0": { "query": "{{ARGS.query || '*'}}", @@ -20,9 +17,6 @@ ] }, "filter": { - "idQueue": [ - 1 - ], "list": { "0": { "type": "time", diff --git a/src/app/dashboards/noted.json b/src/app/dashboards/noted.json index c9b49b64667..8f2db5024b6 100644 --- a/src/app/dashboards/noted.json +++ b/src/app/dashboards/noted.json @@ -2,12 +2,6 @@ "title": "A few notes", "services": { "query": { - "idQueue": [ - 1, - 2, - 3, - 4 - ], "list": { "0": { "query": "*", @@ -23,11 +17,6 @@ ] }, "filter": { - "idQueue": [ - 0, - 1, - 2 - ], "list": {}, "ids": [] } From a14ead5ca787ec1ce5c08bd515bce48a1f91b2fb Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Mon, 2 Dec 2013 16:19:27 -0700 Subject: [PATCH 3/6] Improve performance in the table. Re #719 and #732 --- src/app/app.js | 6 +- src/app/components/require.config.js | 3 +- src/app/panels/table/editor.html | 4 +- src/app/panels/table/module.html | 20 +- src/vendor/angular/bindonce.js | 270 +++++++++++++++++++++++++++ 5 files changed, 289 insertions(+), 14 deletions(-) create mode 100644 src/vendor/angular/bindonce.js diff --git a/src/app/app.js b/src/app/app.js index e331a1b38e1..132e7f2b994 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -11,7 +11,8 @@ define([ 'angular-sanitize', 'angular-strap', 'angular-dragdrop', - 'extend-jquery' + 'extend-jquery', + 'bindonce' ], function (angular, $, _, appLevelRequire) { "use strict"; @@ -84,7 +85,8 @@ function (angular, $, _, appLevelRequire) { '$strap.directives', 'ngSanitize', 'ngDragDrop', - 'kibana' + 'kibana', + 'pasvaz.bindonce' ]; _.each('controllers directives factories services filters'.split(' '), diff --git a/src/app/components/require.config.js b/src/app/components/require.config.js index e987b4cbf73..a13dac6b458 100644 --- a/src/app/components/require.config.js +++ b/src/app/components/require.config.js @@ -20,6 +20,7 @@ require.config({ 'angular-sanitize': '../vendor/angular/angular-sanitize', timepicker: '../vendor/angular/timepicker', datepicker: '../vendor/angular/datepicker', + bindonce: '../vendor/angular/bindonce', underscore: 'components/underscore.extended', 'underscore-src': '../vendor/underscore', @@ -84,7 +85,7 @@ require.config({ 'angular-resource': ['angular'], 'angular-route': ['angular'], 'angular-touch': ['angular'], - + 'bindonce': ['angular'], 'angular-strap': ['angular', 'bootstrap','timepicker', 'datepicker'], timepicker: ['jquery', 'bootstrap'], diff --git a/src/app/panels/table/editor.html b/src/app/panels/table/editor.html index c09d9f198b9..3a4c36bd749 100644 --- a/src/app/panels/table/editor.html +++ b/src/app/panels/table/editor.html @@ -42,7 +42,7 @@
-
Trim Factor Trim fields to this long divided by # of rows
- +
Trim Factor Trim fields to this long divided by # of rows. Requires data refresh.
+
\ No newline at end of file diff --git a/src/app/panels/table/module.html b/src/app/panels/table/module.html index 426424f69d3..83e05f1a08b 100644 --- a/src/app/panels/table/module.html +++ b/src/app/panels/table/module.html @@ -8,7 +8,7 @@
-
+
Fields

@@ -17,13 +17,15 @@
- -
    -
  • + + +
      +
    • {{field}}
      • @@ -61,12 +63,12 @@ - + - {{event._source|stringify|tableTruncate:panel.trimFactor:1}} - + + - + View: diff --git a/src/vendor/angular/bindonce.js b/src/vendor/angular/bindonce.js new file mode 100644 index 00000000000..10a7476e49b --- /dev/null +++ b/src/vendor/angular/bindonce.js @@ -0,0 +1,270 @@ +'use strict'; +/** + * Bindonce - Zero watches binding for AngularJs + * @version v0.2.1 - 2013-05-07 + * @link https://github.com/Pasvaz/bindonce + * @author Pasquale Vazzana + * @license MIT License, http://www.opensource.org/licenses/MIT + */ + + angular.module('pasvaz.bindonce', []) + + .directive('bindonce', function() + { + console.log('called'); + var toBoolean = function(value) + { + if (value && value.length !== 0) + { + var v = angular.lowercase("" + value); + value = !(v == 'f' || v == '0' || v == 'false' || v == 'no' || v == 'n' || v == '[]'); + } + else + { + value = false; + } + return value; + } + + var msie = parseInt((/msie (\d+)/.exec(angular.lowercase(navigator.userAgent)) || [])[1], 10); + if (isNaN(msie)) + { + msie = parseInt((/trident\/.*; rv:(\d+)/.exec(angular.lowercase(navigator.userAgent)) || [])[1], 10); + } + + var bindonceDirective = + { + restrict: "AM", + controller: ['$scope', '$element', '$attrs', '$interpolate', function($scope, $element, $attrs, $interpolate) + { + var showHideBinder = function(elm, attr, value) + { + var show = (attr == 'show') ? '' : 'none'; + var hide = (attr == 'hide') ? '' : 'none'; + elm.css('display', toBoolean(value) ? show : hide); + } + var classBinder = function(elm, value) + { + if (angular.isObject(value) && !angular.isArray(value)) + { + var results = []; + angular.forEach(value, function(value, index) + { + if (value) results.push(index); + }); + value = results; + } + if (value) + { + elm.addClass(angular.isArray(value) ? value.join(' ') : value); + } + } + + var ctrl = + { + watcherRemover : undefined, + binders : [], + group : $attrs.boName, + element : $element, + ran : false, + + addBinder : function(binder) + { + this.binders.push(binder); + + // In case of late binding (when using the directive bo-name/bo-parent) + // it happens only when you use nested bindonce, if the bo-children + // are not dom children the linking can follow another order + if (this.ran) + { + this.runBinders(); + } + }, + + setupWatcher : function(bindonceValue) + { + var that = this; + this.watcherRemover = $scope.$watch(bindonceValue, function(newValue) + { + if (newValue == undefined) return; + that.removeWatcher(); + that.runBinders(); + }, true); + }, + + removeWatcher : function() + { + if (this.watcherRemover != undefined) + { + this.watcherRemover(); + this.watcherRemover = undefined; + } + }, + + runBinders : function() + { + var i, max; + for (i = 0, max = this.binders.length; i < max; i ++) + { + var binder = this.binders[i]; + if (this.group && this.group != binder.group ) continue; + var value = binder.scope.$eval((binder.interpolate) ? $interpolate(binder.value) : binder.value); + switch(binder.attr) + { + case 'if': + if (toBoolean(value)) + { + binder.transclude(binder.scope.$new(), function (clone) + { + var parent = binder.element.parent(); + var afterNode = binder.element && binder.element[binder.element.length - 1]; + var parentNode = parent && parent[0] || afterNode && afterNode.parentNode; + var afterNextSibling = (afterNode && afterNode.nextSibling) || null; + angular.forEach(clone, function(node) + { + parentNode.insertBefore(node, afterNextSibling); + }); + }); + } + break; + case 'hide': + case 'show': + showHideBinder(binder.element, binder.attr, value); + break; + case 'class': + classBinder(binder.element, value); + break; + case 'text': + binder.element.text(value); + break; + case 'html': + binder.element.html(value); + break; + case 'style': + binder.element.css(value); + break; + case 'src': + binder.element.attr(binder.attr, value); + if (msie) binder.element.prop('src', value); + case 'attr': + angular.forEach(binder.attrs, function(attrValue, attrKey) + { + var newAttr, newValue; + if (attrKey.match(/^boAttr./) && binder.attrs[attrKey]) + { + newAttr = attrKey.replace(/^boAttr/, '').replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase(); + newValue = binder.scope.$eval(binder.attrs[attrKey]); + binder.element.attr(newAttr, newValue); + } + }); + break; + case 'href': + case 'alt': + case 'title': + case 'id': + case 'value': + binder.element.attr(binder.attr, value); + break; + } + } + this.ran = true; + this.binders = []; + } + } + + return ctrl; + }], + + link: function(scope, elm, attrs, bindonceController) + { + var value = (attrs.bindonce) ? scope.$eval(attrs.bindonce) : true; + if (value != undefined) + { + bindonceController.runBinders(); + } + else + { + bindonceController.setupWatcher(attrs.bindonce); + elm.bind("$destroy", bindonceController.removeWatcher); + } + } + }; + + return bindonceDirective; +}); + +angular.forEach( +[ + {directiveName:'boShow', attribute: 'show'}, + {directiveName:'boIf', attribute: 'if', transclude: 'element', terminal: true, priority:1000}, + {directiveName:'boHide', attribute:'hide'}, + {directiveName:'boClass', attribute:'class'}, + {directiveName:'boText', attribute:'text'}, + {directiveName:'boHtml', attribute:'html'}, + {directiveName:'boSrcI', attribute:'src', interpolate:true}, + {directiveName:'boSrc', attribute:'src'}, + {directiveName:'boHrefI', attribute:'href', interpolate:true}, + {directiveName:'boHref', attribute:'href'}, + {directiveName:'boAlt', attribute:'alt'}, + {directiveName:'boTitle', attribute:'title'}, + {directiveName:'boId', attribute:'id'}, + {directiveName:'boStyle', attribute:'style'}, + {directiveName:'boValue', attribute:'value'}, + {directiveName:'boAttr', attribute:'attr'} +], +function(boDirective) +{ + var childPriority = 200; + return angular.module('pasvaz.bindonce').directive(boDirective.directiveName, function() + { + var bindonceDirective = + { + priority: boDirective.priority || childPriority, + transclude: boDirective.transclude || false, + terminal: boDirective.terminal || false, + require: '^bindonce', + compile: function (tElement, tAttrs, transclude) + { + return function(scope, elm, attrs, bindonceController) + { + var name = attrs.boParent; + if (name && bindonceController.group != name) + { + var element = bindonceController.element.parent(); + bindonceController = undefined; + var parentValue; + + while (element[0].nodeType != 9 && element.length) + { + if ((parentValue = element.data('$bindonceController')) + && parentValue.group == name) + { + bindonceController = parentValue + break; + } + element = element.parent(); + } + if (!bindonceController) + { + throw Error("No bindonce controller: " + name); + } + } + + bindonceController.addBinder( + { + element : elm, + attr : boDirective.attribute, + attrs : attrs, + value : attrs[boDirective.directiveName], + interpolate : boDirective.interpolate, + group : name, + transclude : transclude, + scope : scope + }); + } + } + } + + return bindonceDirective; + }); +}); \ No newline at end of file From 56e82c0c1b837ebc5aace5951f576e330f4573fb Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Tue, 3 Dec 2013 11:17:59 -0700 Subject: [PATCH 4/6] More small table performance improvements --- src/app/panels/table/module.html | 25 ++++++++++++++----------- src/app/panels/table/module.js | 7 +++++++ src/app/services/fields.js | 19 +++++++++++-------- src/vendor/angular/bindonce.js | 1 - 4 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/app/panels/table/module.html b/src/app/panels/table/module.html index 83e05f1a08b..d8f8e9091e6 100644 --- a/src/app/panels/table/module.html +++ b/src/app/panels/table/module.html @@ -8,26 +8,29 @@
      -
      +
      Fields

      - All / - Current + + All ({{fields.list.length}})
      + + Current ({{current_fields.length || 0}}) +
      @@ -84,18 +87,18 @@ Value - {{key}} + - + - 
      
-              
      
+              
      
+              
      
             
           
         
diff --git a/src/app/panels/table/module.js b/src/app/panels/table/module.js
index 20b07362a61..897dd871a10 100644
--- a/src/app/panels/table/module.js
+++ b/src/app/panels/table/module.js
@@ -85,6 +85,11 @@ function (angular, app, _, kbn, moment) {
     _.defaults($scope.panel,_d);
 
     $scope.init = function () {
+      $scope.columns = {};
+      _.each($scope.panel.fields,function(field) {
+        $scope.columns[field] = true;
+      });
+
       $scope.Math = Math;
       $scope.identity = angular.identity;
       $scope.$on('refresh',function(){$scope.get_data();});
@@ -159,8 +164,10 @@ function (angular, app, _, kbn, moment) {
     $scope.toggle_field = function(field) {
       if (_.indexOf($scope.panel.fields,field) > -1) {
         $scope.panel.fields = _.without($scope.panel.fields,field);
+        delete $scope.columns[field];
       } else {
         $scope.panel.fields.push(field);
+        $scope.columns[field] = true;
       }
     };
 
diff --git a/src/app/services/fields.js b/src/app/services/fields.js
index c59278f0b73..258c60c1371 100644
--- a/src/app/services/fields.js
+++ b/src/app/services/fields.js
@@ -14,20 +14,22 @@ function (angular, _, config) {
 
     this.list = ['_type'];
     this.mapping = {};
+    this.fullMapping = {};
 
     $rootScope.$watch(function(){return dashboard.indices;},function(n) {
       if(!_.isUndefined(n) && n.length) {
         // Only get the mapping for indices we don't know it for
-        var indices = _.difference(n,_.keys(self.mapping));
+        var indices = _.difference(n,_.keys(self.fullMapping));
         // Only get the mapping if there are new indices
         if(indices.length > 0) {
           self.map(indices).then(function(result) {
-            self.mapping = _.extend(self.mapping,result);
-            self.list = mapFields(self.mapping);
+            self.fullMapping = _.extend(self.fullMapping,result);
+            self.list = mapFields(self.fullMapping);
           });
         // Otherwise just use the cached mapping
         } else {
-          self.list = mapFields(_.pick(self.mapping,n));
+          // This is inefficient, should not need to reprocess?
+          self.list = mapFields(_.pick(self.fullMapping,n));
         }
       }
     });
@@ -57,12 +59,13 @@ function (angular, _, config) {
         }
       });
 
+      // Flatten the mapping of each index into dot notated keys.
       return request.then(function(p) {
         var mapping = {};
-        _.each(p.data, function(v,k) {
-          mapping[k] = {};
-          _.each(v, function (v,f) {
-            mapping[k][f] = flatten(v);
+        _.each(p.data, function(type,index) {
+          mapping[index] = {};
+          _.each(type, function (fields,typename) {
+            mapping[index][typename] = flatten(fields);
           });
         });
         return mapping;
diff --git a/src/vendor/angular/bindonce.js b/src/vendor/angular/bindonce.js
index 10a7476e49b..0327d8783da 100644
--- a/src/vendor/angular/bindonce.js
+++ b/src/vendor/angular/bindonce.js
@@ -11,7 +11,6 @@
 
  .directive('bindonce', function()
  {
-  console.log('called');
   var toBoolean = function(value)
   {
     if (value && value.length !== 0)

From e832519d59e93a98a404c9096dd2f8bfe0db21f5 Mon Sep 17 00:00:00 2001
From: Rashid Khan 
Date: Tue, 3 Dec 2013 11:52:25 -0700
Subject: [PATCH 5/6] Potential fix for #621

---
 src/app/services/dashboard.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/app/services/dashboard.js b/src/app/services/dashboard.js
index 36931bf7dc2..35abb269f07 100644
--- a/src/app/services/dashboard.js
+++ b/src/app/services/dashboard.js
@@ -184,17 +184,19 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
       // Set the current dashboard
       self.current = _.clone(dashboard);
 
-      // Ok, now that we've setup the current dashboard, we can inject our services
-      querySrv = $injector.get('querySrv');
-      filterSrv = $injector.get('filterSrv');
+      // Delay this until we're sure that querySrv and filterSrv are ready
+      $timeout(function() {
+        // Ok, now that we've setup the current dashboard, we can inject our services
+        querySrv = $injector.get('querySrv');
+        filterSrv = $injector.get('filterSrv');
 
-      // Make sure these re-init
-      querySrv.init();
-      filterSrv.init();
-
-      // If there's an interval set, the indices have not been calculated yet,
-      // so there is no data. Call refresh to calculate the indices and notify the panels.
-      self.refresh();
+        // Make sure these re-init
+        querySrv.init();
+        filterSrv.init();
+      },0).then(function() {
+        // Call refresh to calculate the indices and notify the panels that we're ready to roll
+        self.refresh();
+      });
 
       if(dashboard.refresh) {
         self.set_interval(dashboard.refresh);

From d0f90b00c8520d7b825072faf7aea5d8402e435a Mon Sep 17 00:00:00 2001
From: Rashid Khan 
Date: Tue, 3 Dec 2013 14:14:07 -0700
Subject: [PATCH 6/6] Closes #538. Closes #722

---
 src/vendor/angular/angular-strap.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/vendor/angular/angular-strap.js b/src/vendor/angular/angular-strap.js
index caee5eecbd7..189d9ef4b2a 100644
--- a/src/vendor/angular/angular-strap.js
+++ b/src/vendor/angular/angular-strap.js
@@ -712,11 +712,15 @@ angular.module('$strap.directives').directive('bsTabs', [
             scope.$watch(iAttrs.ngModel, function (newValue, oldValue) {
               if (angular.isUndefined(newValue))
                 return;
+              console.log(oldValue +" -> "+ newValue);
               activeTab = newValue;
               setTimeout(function () {
-                var $next = $($tabs[0].querySelectorAll('li')[newValue * 1]);
-                if (!$next.hasClass('active')) {
-                  $next.children('a').tab('show');
+                // Check if we're still on the same tab before making the switch
+                if(activeTab === newValue) {
+                  var $next = $($tabs[0].querySelectorAll('li')[newValue * 1]);
+                  if (!$next.hasClass('active')) {
+                    $next.children('a').tab('show');
+                  }
                 }
               });
             });