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 2013/12/06 17:21:55 UTC
[3/4] git commit: ISIS-486: further tweak on the modal dialog
animations.
ISIS-486: further tweak on the modal dialog animations.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3a6a37e6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3a6a37e6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3a6a37e6
Branch: refs/heads/master
Commit: 3a6a37e6ef8e9dd606456c70965192653c7c5fd5
Parents: 7d81325
Author: Dan Haywood <da...@apache.org>
Authored: Fri Dec 6 15:55:05 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Fri Dec 6 15:55:05 2013 +0000
----------------------------------------------------------------------
.../isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3a6a37e6/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 c3039da..a18ea44 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
@@ -21,12 +21,17 @@ $(document).ready(function() {
var timeoutId;
isisShowVeil = function() {
+ if(timeoutId) {
+ clearTimeout(timeoutId);
+ timeoutId = null;
+ }
$("#veil").stop().show();
}
isisFadeInVeil = function(attributes, jqxhr, settings) {
/*
$("#veil").fadeIn(750);
*/
+ // use timeouts because JQuery's delay(...) cannot be stopped.
var activeEl = attributes.currentTarget.activeElement;
timeoutId = setTimeout(function() {
$("#veil").fadeIn(750);
@@ -37,9 +42,8 @@ $(document).ready(function() {
if(timeoutId) {
clearTimeout(timeoutId);
timeoutId = null;
- } else {
- $("#veil").stop().hide();
}
+ $("#veil").stop().hide();
}
/* for modal dialogs */