Merge pull request #651 from jan-stanek/oprava-potvrzovani

#647 - oprava potvrzovacich tlacitek
skaut · Feb 27, 2019 · 0b36e55 · 0b36e55
2 parents 629d1f4 + 3ec8460
commit 0b36e55
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
         "ext-json": "*",
         "ext-mysqli": "*",
 
-        "nette/nette": "^2.4",
+        "nette/nette": "~2.4.0",
         "latte/latte": "~2.4.0",
 
         "kdyby/doctrine": "^3.3",

diff --git a/www/js/libs/bootstrap-confirmation/bootstrap-confirmation.js b/www/js/libs/bootstrap-confirmation/bootstrap-confirmation.js
@@ -1,7 +1,7 @@
 /*!
  * Bootstrap Confirmation
  * Copyright 2013 Nimit Suwannagate <ethaizone@hotmail.com>
- * Copyright 2014-2017 Damien "Mistic" Sorel <contact@git.strangeplanet.fr>
+ * Copyright 2014-2019 Damien "Mistic" Sorel <contact@git.strangeplanet.fr>
  * Licensed under the Apache License, Version 2.0
  */
 
@@ -21,7 +21,7 @@
     this.init(element, options);
   };
 
-  Confirmation.VERSION = '2.4.2';
+  Confirmation.VERSION = '2.4.3';
 
   /**
    * Map between keyboard events "keyCode|which" and "key"
@@ -68,6 +68,10 @@
     // @formatter:on
   });
 
+  if (Confirmation.DEFAULTS.whiteList) {
+    Confirmation.DEFAULTS.whiteList['*'].push('data-apply', 'data-dismiss');
+  }
+
   Confirmation.prototype = $.extend({}, $.fn.popover.Constructor.prototype);
   Confirmation.prototype.constructor = Confirmation;