You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/11/07 04:50:51 UTC
[05/18] isis git commit: ISIS-537 Improve the logic for
showing/hiding the CopyLink modal window with alt+] keyboard combination
ISIS-537 Improve the logic for showing/hiding the CopyLink modal window with alt+] keyboard combination
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/da9e3605
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/da9e3605
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/da9e3605
Branch: refs/heads/master
Commit: da9e36058564324d5d5cfda3ec1d5a97c28e2e25
Parents: 2fc840f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Nov 5 00:30:35 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Nov 5 00:30:35 2014 +0200
----------------------------------------------------------------------
.../wicket/ui/pages/jquery.isis.wicket.viewer.js | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/da9e3605/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
index bff6a9c..f502195 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
@@ -93,15 +93,16 @@ $(function() {
* Show/hide the CopyLink modal window with alt+]
*/
$('body').keydown(function(e) {
- var $copyModal = $('.copyModal');
-
- if(!Isis.copyModalShown && e.which === 221 && e.altKey) {
- Isis.copyModalShown = true;
- $('.copyLink').click();
- } else {
- $copyModal.modal('hide');
- $('.modal-backdrop').remove();
- Isis.copyModalShown = false;
+ if (e.which === 221 && e.altKey) {
+ if (Isis.copyModalShown) {
+ $('.copyModal').modal('hide');
+ $('.modal-backdrop').remove();
+ Isis.copyModalShown = false;
+ }
+ else {
+ Isis.copyModalShown = true;
+ $('.copyLink').click();
+ }
}
});