aboutsummaryrefslogtreecommitdiff
path: root/js/tab.js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-14 15:38:21 -0800
committerMark Otto <[email protected]>2013-12-14 15:38:21 -0800
commita54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3 (patch)
tree9b1c5697a731543a86711b016e1986ec1e81dad4 /js/tab.js
parent80e86442308b2cc86ba948de87e854057933e3ab (diff)
parentf1869771bc8b8e8a6c7a98385ec58e0bf0d2d98e (diff)
downloadbootstrap-a54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3.tar.xz
bootstrap-a54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3.zip
Merge branch 'master' into pr/10951
Conflicts: dist/css/bootstrap.min.css less/modals.less
Diffstat (limited to 'js/tab.js')
-rw-r--r--js/tab.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/js/tab.js b/js/tab.js
index e1c155920..c584ebf98 100644
--- a/js/tab.js
+++ b/js/tab.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: tab.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#tabs
+ * Bootstrap: tab.js v3.0.3
+ * http://getbootstrap.com/javascript/#tabs
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
* ======================================================================== */
-+function ($) { "use strict";
++function ($) { 'use strict';
// TAB CLASS DEFINITION
// ====================
@@ -30,7 +30,7 @@
Tab.prototype.show = function () {
var $this = this.element
var $ul = $this.closest('ul:not(.dropdown-menu)')
- var selector = $this.attr('data-target')
+ var selector = $this.data('target')
if (!selector) {
selector = $this.attr('href')
@@ -132,4 +132,4 @@
$(this).tab('show')
})
-}(window.jQuery);
+}(jQuery);