TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A nested tab plugin's tabs are leaking in to the parent tab plugin. 

Fixes #2481
This commit is contained in:
Samuel Georges 2016-11-14 08:46:32 +11:00
parent a2a0b207c6
commit f4f7355bf2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/system/assets/ui/js/tab.js
View File

@ -14,8 +14,8 @@
var $el = this.$el = $(element); var $el = this.$el = $(element);
this.options = options || {} this.options = options || {}
this.$tabsContainer = $('.nav-tabs', $el) this.$tabsContainer = $('.nav-tabs:first', $el)
this.$pagesContainer = $('.tab-content', $el) this.$pagesContainer = $('.tab-content:first', $el)
this.tabId = 'tabs' + $el.parents().length + Math.round(Math.random()*1000); this.tabId = 'tabs' + $el.parents().length + Math.round(Math.random()*1000);
if (this.options.closable !== undefined && this.options.closable !== false) if (this.options.closable !== undefined && this.options.closable !== false)

4
modules/system/assets/ui/storm-min.js vendored
View File

@ -4201,8 +4201,8 @@ data[option].apply(data,methodArgs)}})}
$.fn.dragScroll.Constructor=DragScroll $.fn.dragScroll.Constructor=DragScroll
$.fn.dragScroll.noConflict=function(){$.fn.dragScroll=old $.fn.dragScroll.noConflict=function(){$.fn.dragScroll=old
return this}}(window.jQuery);+function($){"use strict";var Tab=function(element,options){var $el=this.$el=$(element);this.options=options||{} return this}}(window.jQuery);+function($){"use strict";var Tab=function(element,options){var $el=this.$el=$(element);this.options=options||{}
this.$tabsContainer=$('.nav-tabs',$el) this.$tabsContainer=$('.nav-tabs:first',$el)
this.$pagesContainer=$('.tab-content',$el) this.$pagesContainer=$('.tab-content:first',$el)
this.tabId='tabs'+$el.parents().length+Math.round(Math.random()*1000);if(this.options.closable!==undefined&&this.options.closable!==false) this.tabId='tabs'+$el.parents().length+Math.round(Math.random()*1000);if(this.options.closable!==undefined&&this.options.closable!==false)
$el.attr('data-closable','') $el.attr('data-closable','')
this.init()} this.init()}