From 39291967d6cc94e3e7f0c4c4f61b5c76580ac4a3 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Thu, 4 Jun 2015 17:37:08 +1000 Subject: [PATCH] Fix minor issue with tabs events not firing --- modules/backend/assets/js/october-min.js | 2 +- modules/system/assets/ui/js/tab.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js index 24cd3cf2f..0282fc2ee 100644 --- a/modules/backend/assets/js/october-min.js +++ b/modules/backend/assets/js/october-min.js @@ -4195,7 +4195,7 @@ this.$el.on('modified.oc.tab',function(ev){ev.preventDefault() self.modifyTab($(ev.target).closest('ul.nav-tabs > li, div.tab-content > div'))}) this.$el.on('unmodified.oc.tab',function(ev){ev.preventDefault() self.unmodifyTab($(ev.target).closest('ul.nav-tabs > li, div.tab-content > div'))}) -this.$tabsContainer.on('shown.oc.tab','li',function(){$(window).trigger('oc.updateUi') +this.$tabsContainer.on('shown.bs.tab','li',function(){$(window).trigger('oc.updateUi') var tabUrl=$('> a',this).data('tabUrl') if(tabUrl){window.history.replaceState({},'Tab link reference',tabUrl)}}) if(this.options.slidable){this.$pagesContainer.touchwipe({wipeRight:function(){self.prev();},wipeLeft:function(){self.next();},preventDefaultEvents:false,min_move_x:60});} diff --git a/modules/system/assets/ui/js/tab.js b/modules/system/assets/ui/js/tab.js index 0cdb4274c..416d02a76 100644 --- a/modules/system/assets/ui/js/tab.js +++ b/modules/system/assets/ui/js/tab.js @@ -112,7 +112,7 @@ self.unmodifyTab($(ev.target).closest('ul.nav-tabs > li, div.tab-content > div')) }) - this.$tabsContainer.on('shown.oc.tab', 'li', function(){ + this.$tabsContainer.on('shown.bs.tab', 'li', function(){ // self.$tabsContainer.dragScroll('fixScrollClasses') $(window).trigger('oc.updateUi')