summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2011-11-02 19:18:19 +0000
committertkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2011-11-02 19:18:19 +0000
commit45e84536bdecb52fd730a348e38db1c50ff66652 (patch)
tree39431ee76c5cc2a458b059f2e96f7b0554807574
parentf6f554b66ac63710897004a31172d644b9f23688 (diff)
downloadmocca-45e84536bdecb52fd730a348e38db1c50ff66652.tar.gz
mocca-45e84536bdecb52fd730a348e38db1c50ff66652.tar.bz2
mocca-45e84536bdecb52fd730a348e38db1c50ff66652.zip
tentative deployJava update to open in new window
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@988 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
-rw-r--r--BKUOnline/src/main/webapp/js/deployJava.js15
1 files changed, 8 insertions, 7 deletions
diff --git a/BKUOnline/src/main/webapp/js/deployJava.js b/BKUOnline/src/main/webapp/js/deployJava.js
index 829544c0..2636186c 100644
--- a/BKUOnline/src/main/webapp/js/deployJava.js
+++ b/BKUOnline/src/main/webapp/js/deployJava.js
@@ -37,6 +37,7 @@
* (not needed anymore)
* [#424] Web Start loading via java plugin (Sun deployment script) fails on WinXP/Vista
* (not needed anymore)
+ * Open Java Installation in new Window/Tab (to escape iFrame)
*
* features:
* [#425] Disable WebStart Launch Button for MacOS X < 1.6
@@ -241,7 +242,7 @@ var deployJava = {
setInterval("deployJava.poll()", 3000);
}
- location.href = deployJava.EarlyAccessURL;
+ window.open(deployJava.EarlyAccessURL);
// we have to return false although there may be an install
// in progress now, when complete it may go to return page
@@ -253,13 +254,13 @@ var deployJava = {
(platform.indexOf('win32') != -1)) {
return deployJava.FFInstall();
} else {
- location.href = deployJava.getJavaURL +
+ window.open(deployJava.getJavaURL +
((deployJava.returnPage != null) ?
('&returnPage=' + deployJava.returnPage) : '') +
((deployJava.locale != null) ?
('&locale=' + deployJava.locale) : '') +
((deployJava.brand != null) ?
- ('&brand=' + deployJava.brand) : '');
+ ('&brand=' + deployJava.brand) : ''));
}
// we have to return false although there may be an install
// in progress now, when complete it may go to return page
@@ -952,14 +953,14 @@ var deployJava = {
IEInstall: function() {
- location.href = deployJava.getJavaURL +
+ window.open(deployJava.getJavaURL +
((deployJava.returnPage != null) ?
('&returnPage=' + deployJava.returnPage) : '') +
((deployJava.locale != null) ?
('&locale=' + deployJava.locale) : '') +
((deployJava.brand != null) ? ('&brand=' + deployJava.brand) : '') +
((deployJava.installType != null) ?
- ('&type=' + deployJava.installType) : '');
+ ('&type=' + deployJava.installType) : ''));
// should not actually get here
return false;
@@ -970,14 +971,14 @@ var deployJava = {
FFInstall: function() {
- location.href = deployJava.getJavaURL +
+ window.open(deployJava.getJavaURL +
((deployJava.returnPage != null) ?
('&returnPage=' + deployJava.returnPage) : '') +
((deployJava.locale != null) ?
('&locale=' + deployJava.locale) : '') +
((deployJava.brand != null) ? ('&brand=' + deployJava.brand) : '') +
((deployJava.installType != null) ?
- ('&type=' + deployJava.installType) : '');
+ ('&type=' + deployJava.installType) : ''));
// should not actually get here
return false;