summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-06-23 09:50:54 +0000
committerclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-06-23 09:50:54 +0000
commit8f71c09ff5f9edafa5ee897d56da493468c4101b (patch)
tree1d66a23540d5f9350e95d25e974880aa9fea2755
parent84b95d9e7dcdcd0ca2245121c7797e068a33183e (diff)
downloadmocca-8f71c09ff5f9edafa5ee897d56da493468c4101b.tar.gz
mocca-8f71c09ff5f9edafa5ee897d56da493468c4101b.tar.bz2
mocca-8f71c09ff5f9edafa5ee897d56da493468c4101b.zip
Workaround to [#424] Web Start loading via java plugin (Sun deployment script) fails on WinXP
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@370 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
-rw-r--r--BKUOnline/src/main/webapp/index.html5
-rw-r--r--BKUOnline/src/main/webapp/js/deployJava.js17
2 files changed, 13 insertions, 9 deletions
diff --git a/BKUOnline/src/main/webapp/index.html b/BKUOnline/src/main/webapp/index.html
index b0e519a5..aa09f9f4 100644
--- a/BKUOnline/src/main/webapp/index.html
+++ b/BKUOnline/src/main/webapp/index.html
@@ -20,7 +20,7 @@
<title>MOCCA Online</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<style type="text/css" media="all">@import "css/main.css";</style>
- <script src="http://java.com/js/deployJava.js"></script>
+ <script src="js/deployJava.js"></script>
</head>
<body>
<div id="animDiv" class="box">
@@ -32,13 +32,12 @@
<h1>STAL Service</h1>
<a href="stal">STAL Service Endpoint</a>
<!-- MOCCA Web Start
- | (activate 'include-webstart' profile)
+ | (activate 'include-webstart' profile) -->
<h1>MOCCA Web Start</h1>
<script>
var url="webstart/mocca.jnlp"
deployJava.createWebStartLaunchButton(url, "1.6")
</script>
- |-->
</p>
</div>
</body>
diff --git a/BKUOnline/src/main/webapp/js/deployJava.js b/BKUOnline/src/main/webapp/js/deployJava.js
index 8d644e00..dbeab995 100644
--- a/BKUOnline/src/main/webapp/js/deployJava.js
+++ b/BKUOnline/src/main/webapp/js/deployJava.js
@@ -31,8 +31,11 @@
/*
* Added by EGIZ:
- * This file contains a workaround to https://bugzilla.mozilla.org/show_bug.cgi?id=498132
- * (see lines 90-92)
+ * This file contains workarounds to
+ * [#423] Firefox 3.0.11 bug #498132 causes applet loading failure
+ * (lines 95-99)
+ * [#424] Web Start loading via java plugin (Sun deployment script) fails on WinXP
+ * (lines 501-506)
*/
/*
@@ -89,6 +92,7 @@ var deployJava = {
var list = new Array();
if (deployJava.isPluginInstalled()) {
var plugin = deployJava.getPlugin();
+ //[#423] Firefox 3.0.11 bug #498132 causes applet loading failure
var jvms = plugin.jvms;
for (var i = 0; i < jvms.getLength(); i++) {
list[i] = jvms.get(i).version;
@@ -493,12 +497,13 @@ var deployJava = {
* Launch a JNLP application, (using the plugin if available)
*/
launch: function(jnlp) {
- if (deployJava.isPluginInstalled()) {
- return deployJava.getPlugin().launch(jnlp);
- } else {
+ //[#424] Web Start loading via java plugin (Sun deployment script) fails on WinXP
+// if (deployJava.isPluginInstalled()) {
+// return deployJava.getPlugin().launch(jnlp);
+// } else {
document.location=jnlp;
return true;
- }
+// }
},