From 2a1dc06811cbaad467b7d94cdb9892d74df334d3 Mon Sep 17 00:00:00 2001 From: Mohammad Younes Date: Mon, 6 Jan 2014 00:00:06 +0200 Subject: [PATCH 1/3] A more consistent selector. --- server/documents/modules/modal.html.eco | 4 ++-- src/modules/modal.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/documents/modules/modal.html.eco b/server/documents/modules/modal.html.eco index fa1ca6259..9f122d1ab 100755 --- a/server/documents/modules/modal.html.eco +++ b/server/documents/modules/modal.html.eco @@ -444,7 +444,7 @@ type : 'UI Module' onDeny Modal - Is called after a negative or cancel button is pressed. + Is called after a negative or deny button is pressed. @@ -473,7 +473,7 @@ type : 'UI Module' selector : { close : '.close, .actions .button', approve : '.actions .positive, .actions .approve', - deny : '.actions .negative, .actions .cancel' + deny : '.actions .negative, .actions .deny' }, diff --git a/src/modules/modal.js b/src/modules/modal.js index 3df3c1b6b..43e455828 100755 --- a/src/modules/modal.js +++ b/src/modules/modal.js @@ -675,7 +675,7 @@ $.fn.modal.settings = { selector : { close : '.close, .actions .button', approve : '.actions .positive, .actions .approve', - deny : '.actions .negative, .actions .cancel', + deny : '.actions .negative, .actions .deny', modal : '.ui.modal' }, error : { From cc9e0ba823fdfaa96bd9a19cf4bc76cf109fb5a0 Mon Sep 17 00:00:00 2001 From: Mohammad Younes Date: Mon, 6 Jan 2014 17:21:54 +0200 Subject: [PATCH 2/3] Add ok/cancel combination to the selectors list --- src/modules/modal.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/modal.js b/src/modules/modal.js index 43e455828..e9e949bb4 100755 --- a/src/modules/modal.js +++ b/src/modules/modal.js @@ -674,8 +674,8 @@ $.fn.modal.settings = { selector : { close : '.close, .actions .button', - approve : '.actions .positive, .actions .approve', - deny : '.actions .negative, .actions .deny', + approve : '.actions .positive, .actions .approve, .actions .ok', + deny : '.actions .negative, .actions .deny, .actions .cancel', modal : '.ui.modal' }, error : { @@ -689,4 +689,4 @@ $.fn.modal.settings = { }; -})( jQuery, window , document ); \ No newline at end of file +})( jQuery, window , document ); From d9a1041092d6fbe3d4ca23b783142f85d2ca2ee7 Mon Sep 17 00:00:00 2001 From: Mohammad Younes Date: Mon, 6 Jan 2014 17:24:07 +0200 Subject: [PATCH 3/3] Add ok/cancel combination to the selectors list --- server/documents/modules/modal.html.eco | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/documents/modules/modal.html.eco b/server/documents/modules/modal.html.eco index 9f122d1ab..3cd22df41 100755 --- a/server/documents/modules/modal.html.eco +++ b/server/documents/modules/modal.html.eco @@ -168,7 +168,7 @@ type : 'UI Module'

Approve / Deny Callbacks

-

Modals will automatically tie approve deny callbacks to any positive/approve or negative/deny buttons. If a callback returns false it will prevent the modal from closing

+

Modals will automatically tie approve deny callbacks to any positive/approve or negative/deny or ok/cancel buttons. If a callback returns false it will prevent the modal from closing

$('.basic.modal') .modal('setting', { @@ -444,7 +444,7 @@ type : 'UI Module' onDeny Modal - Is called after a negative or deny button is pressed. + Is called after a negative or deny or cancel button is pressed. @@ -472,8 +472,8 @@ type : 'UI Module'
selector : { close : '.close, .actions .button', - approve : '.actions .positive, .actions .approve', - deny : '.actions .negative, .actions .deny' + approve : '.actions .positive, .actions .approve, .actions .ok', + deny : '.actions .negative, .actions .deny, .actions .cancel' },
@@ -539,4 +539,4 @@ type : 'UI Module'
-
\ No newline at end of file +