You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2017/01/24 10:08:45 UTC
[1/2] syncope git commit: [SYNCOPE-1001] Reloading workflow page when
closing the Activiti Modeler popup
Repository: syncope
Updated Branches:
refs/heads/2_0_X 489a28164 -> bc310b1a3
refs/heads/master 319fff45d -> b709acfaf
[SYNCOPE-1001] Reloading workflow page when closing the Activiti Modeler popup
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bc310b1a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bc310b1a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bc310b1a
Branch: refs/heads/2_0_X
Commit: bc310b1a3f9da14ed078cef5a98686f2e212db90
Parents: 489a281
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Jan 24 11:08:29 2017 +0100
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Jan 24 11:08:29 2017 +0100
----------------------------------------------------------------------
.../wicket/markup/html/link/VeilPopupSettings.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/bc310b1a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java
index 51c8ec5..6a766be 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java
@@ -26,7 +26,15 @@ public class VeilPopupSettings extends PopupSettings {
@Override
public String getPopupJavaScript() {
- return "document.getElementById('veil').style.display = 'block';" + super.getPopupJavaScript();
+ return "document.getElementById('veil').style.display = 'block';"
+ + super.getPopupJavaScript().substring(0, super.getPopupJavaScript().lastIndexOf("return false;"))
+ + "var loop = setInterval(function() { "
+ + " if(w.closed) {"
+ + " clearInterval(loop);"
+ + " window.location.reload(false);"
+ + " }"
+ + "}, 1000);"
+ + "return false";
}
}
[2/2] syncope git commit: [SYNCOPE-1001] Reloading workflow page when
closing the Activiti Modeler popup
Posted by il...@apache.org.
[SYNCOPE-1001] Reloading workflow page when closing the Activiti Modeler popup
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b709acfa
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b709acfa
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b709acfa
Branch: refs/heads/master
Commit: b709acfafe6228a63fef698f0f8f9fa237afec7b
Parents: 319fff4
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Jan 24 11:08:29 2017 +0100
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Jan 24 11:08:39 2017 +0100
----------------------------------------------------------------------
.../wicket/markup/html/link/VeilPopupSettings.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/b709acfa/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java
index 51c8ec5..6a766be 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java
@@ -26,7 +26,15 @@ public class VeilPopupSettings extends PopupSettings {
@Override
public String getPopupJavaScript() {
- return "document.getElementById('veil').style.display = 'block';" + super.getPopupJavaScript();
+ return "document.getElementById('veil').style.display = 'block';"
+ + super.getPopupJavaScript().substring(0, super.getPopupJavaScript().lastIndexOf("return false;"))
+ + "var loop = setInterval(function() { "
+ + " if(w.closed) {"
+ + " clearInterval(loop);"
+ + " window.location.reload(false);"
+ + " }"
+ + "}, 1000);"
+ + "return false";
}
}