From 22be51d722e0cbe2cfedbdcb6618c0a2a208cda0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= Date: Wed, 27 Feb 2019 22:41:51 +0100 Subject: [PATCH 1/2] #646 oprava potvrzovacich tlacitek --- .../libs/bootstrap-confirmation/bootstrap-confirmation.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/www/js/libs/bootstrap-confirmation/bootstrap-confirmation.js b/www/js/libs/bootstrap-confirmation/bootstrap-confirmation.js index 4ec5948d5..5fe1a8ad2 100644 --- 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 - * Copyright 2014-2017 Damien "Mistic" Sorel + * Copyright 2014-2019 Damien "Mistic" Sorel * 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; From 3ec8460e168ace2eecd5aadf897292d32985f920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= Date: Wed, 27 Feb 2019 22:54:55 +0100 Subject: [PATCH 2/2] zavislost na nette 2.4 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7b9fcd07f..1d9b65d4e 100644 --- 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",