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:46:26 UTC
[02/29] isis git commit: ISIS-537 Show/hide the CopyLink modal window
with alt+] keyboard combination
ISIS-537 Show/hide the CopyLink modal window with alt+] keyboard combination
https://trello.com/c/ZothDcdD/102-bug-if-do-alt-twice-in-succession-then-cancel-does-not-remove-the-veil
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b97fac42
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b97fac42
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b97fac42
Branch: refs/heads/ISIS-939
Commit: b97fac426840fa2d3a9415c45d02ce6a9ca4947c
Parents: 8efdfa0
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Nov 4 22:47:17 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Nov 4 22:47:17 2014 +0200
----------------------------------------------------------------------
.../widgets/zclip/ZeroClipboardPanel.html | 4 ++--
.../wicket/ui/pages/jquery.isis.wicket.viewer.js | 17 +++++++++++++----
2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b97fac42/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
index f4c8857..52d1dfd 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
@@ -24,11 +24,11 @@
<i class="fa fa-fw fa-link fa-lg"></i>
</a>
<wicket:remove>
- TODO reenable the subscribing link after figuring out what it is.
+ TODO mgrigorov reenable the subscribing link after figuring out what it is.
Can we have a separate <li></li> for it ?
</wicket:remove>
<!--<a wicket:id="subscribingLink" id="subscribingLink" class="subscribingLink" href="#"> </a>-->
- <div wicket:id="simpleClipboardModalWindow"></div>
+ <div wicket:id="simpleClipboardModalWindow" class="copyModal"></div>
</wicket:panel>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/b97fac42/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 1178319..b7cf9dd 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
@@ -27,7 +27,8 @@ $(function() {
window.Isis = {
Topic: {
OPEN_IN_NEW_TAB: 'openInNewTab'
- }
+ },
+ copyModalShown: false
};
var isisVeilTimeoutId;
@@ -88,11 +89,19 @@ $(function() {
});
});
-
+ /**
+ * Show/hide the CopyLink modal window with alt+]
+ */
$('body').keydown(function(e) {
- // alt+]
- if(e.which === 221 && e.altKey) {
+ 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;
}
});
});