Fix preventDefault bug

tavicu · Oct 18, 2015 · 45613b1 · 45613b1
1 parent cd58620
commit 45613b1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# bootstrap-confirmation v1.0.4
+# bootstrap-confirmation v1.0.5
 
 This is a fork of ethaizone's [original code](https://github.com/ethaizone/Bootstrap-Confirmation)
 

diff --git a/bootstrap-confirmation.js b/bootstrap-confirmation.js
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Confirmation v1.0.4
+ * Bootstrap Confirmation v1.0.5
  * https://github.com/tavicu/bs-confirmation
  */
 +function ($) {
@@ -65,14 +65,20 @@
 			}
 		});
 
-		$(element).on('click', function(e) {
-			e.preventDefault();
-		});
+		if(options.selector) {
+			$(element).on('click.bs.confirmation', options.selector, function(e) {
+				e.preventDefault();
+			});
+		} else {
+			$(element).on('click.bs.confirmation', function(e) {
+				e.preventDefault();
+			});
+		}
 	}
 
 	if (!$.fn.popover || !$.fn.tooltip) throw new Error('Confirmation requires popover.js and tooltip.js');
 
-	Confirmation.VERSION  = '1.0.4'
+	Confirmation.VERSION  = '1.0.5'
 
 	Confirmation.DEFAULTS = $.extend({}, $.fn.popover.Constructor.DEFAULTS, {
 		placement 		: 'right',

diff --git a/bootstrap-confirmation.min.js b/bootstrap-confirmation.min.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "bs-confirmation",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"main": "bootstrap-confirmation.js",
 	"keywords": [ "bootstrap", "confirm", "confirmation"],
 	"description": "Confirmation plugin compatible with Twitter Bootstrap 3 extending Popover",

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
 	"keywords": ["bootstrap", "bootstrap dialog", "bootstrap confirmation", "confirmation"],
 	"description": "Confirmation plugin compatible with Twitter Bootstrap 3 extending Popover",
 	"homepage": "https://github.com/tavicu/bs-confirmation",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"authors": [
 		{
 			"name": "Tavicu",