aboutsummaryrefslogtreecommitdiff
path: root/assets/js/application.js
diff options
context:
space:
mode:
authorfat <[email protected]>2013-07-26 20:34:59 -0700
committerfat <[email protected]>2013-07-26 20:34:59 -0700
commit6fdb18b6418d17752ee868bc21584e747b84f809 (patch)
tree287bc453dc2de09bfab3f89dd04a4500f91f56ee /assets/js/application.js
parente2d4cf5f683e13440c98d36b6a38d1b501336adc (diff)
parent46a332049fa37dc1c6baad822cdaa32995e1ea60 (diff)
downloadbootstrap-6fdb18b6418d17752ee868bc21584e747b84f809.tar.xz
bootstrap-6fdb18b6418d17752ee868bc21584e747b84f809.zip
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'assets/js/application.js')
-rw-r--r--assets/js/application.js5
1 files changed, 1 insertions, 4 deletions
diff --git a/assets/js/application.js b/assets/js/application.js
index dfef03d35..8adb5dccb 100644
--- a/assets/js/application.js
+++ b/assets/js/application.js
@@ -67,11 +67,8 @@
})
// popover demo
- $("a[data-toggle=popover]")
+ $("[data-toggle=popover]")
.popover()
- .click(function(e) {
- e.preventDefault()
- })
// button state demo
$('#fat-btn')