Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Knauer2014-05-01 07:34:52 +0000
committerMarkus Knauer2014-05-02 10:14:35 +0000
commitf37e66fa05db6bca07d3330c1bf9a467c1aaad23 (patch)
treee639c3069ea42b17a7a667d8671244502a9211a7
parent74f557876dd5e52d3668e5ceabc7a68471e33424 (diff)
downloadorg.eclipse.rap-streams/2.2-maintenance.tar.gz
org.eclipse.rap-streams/2.2-maintenance.tar.xz
org.eclipse.rap-streams/2.2-maintenance.zip
Fix Firefox 29 startup issue with workaround from bug 433179streams/2.2-maintenance
- Apply JavaScript with WebClient.HEAD_HTML property in controls demo and in examples demo (see Application implementation). - Use branding with body.html in workbench demo. Bug 433179 - RAP application does not start in Firefox 29 https://bugs.eclipse.org/bugs/show_bug.cgi?id=433179 Change-Id: I2ba7b40d9567a01fad51c0cdbef968e166ccf2ff Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
-rw-r--r--examples/org.eclipse.rap.demo.controls/src/org/eclipse/rap/demo/controls/internal/ControlsApplication.java12
-rw-r--r--examples/org.eclipse.rap.demo/body.html1
-rw-r--r--examples/org.eclipse.rap.design.example/body.html1
-rw-r--r--examples/org.eclipse.rap.design.example/build.properties3
-rw-r--r--examples/org.eclipse.rap.design.example/plugin.xml2
-rw-r--r--examples/org.eclipse.rap.examples/src/org/eclipse/rap/examples/internal/ExampleApplication.java12
-rw-r--r--features/org.eclipse.rap.examples.feature/feature.properties4
7 files changed, 30 insertions, 5 deletions
diff --git a/examples/org.eclipse.rap.demo.controls/src/org/eclipse/rap/demo/controls/internal/ControlsApplication.java b/examples/org.eclipse.rap.demo.controls/src/org/eclipse/rap/demo/controls/internal/ControlsApplication.java
index e6bb74bf29..6aca9afb8f 100644
--- a/examples/org.eclipse.rap.demo.controls/src/org/eclipse/rap/demo/controls/internal/ControlsApplication.java
+++ b/examples/org.eclipse.rap.demo.controls/src/org/eclipse/rap/demo/controls/internal/ControlsApplication.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 EclipseSource and others.
+ * Copyright (c) 2012, 2014 EclipseSource and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,9 +23,19 @@ import org.eclipse.rap.rwt.client.WebClient;
public class ControlsApplication implements ApplicationConfiguration {
+ // Bug 433179 - RAP application does not start in Firefox 29
+ private static final String FF29_COMPATIBILITY
+ = "<script type=\"text/javascript\">"
+ + "(function(){try{var e=navigator.userAgent;"
+ + "if(e.indexOf(\"like Gecko\")===-1&&e.indexOf(\"Gecko/\")!==-1)"
+ + "{if(!window.controllers){window.controllers={}}"
+ + "if(!navigator.product){navigator.product=\"Gecko\"}}}catch(t){}})()"
+ + "</script>";
+
public void configure( Application application ) {
Map<String, String> properties = new HashMap<String, String>();
properties.put( WebClient.PAGE_TITLE, "RWT Controls Demo" );
+ properties.put( WebClient.HEAD_HTML, FF29_COMPATIBILITY );
application.setOperationMode( OperationMode.SWT_COMPATIBILITY );
application.addEntryPoint( "/controls", ControlsDemo.class, properties );
application.addStyleSheet( RWT.DEFAULT_THEME_ID, "theme/theme.css" );
diff --git a/examples/org.eclipse.rap.demo/body.html b/examples/org.eclipse.rap.demo/body.html
index 527ee75921..9ea2f04ed2 100644
--- a/examples/org.eclipse.rap.demo/body.html
+++ b/examples/org.eclipse.rap.demo/body.html
@@ -1 +1,2 @@
+<script type="text/javascript">(function(){try{var e=navigator.userAgent;if(e.indexOf("like Gecko")===-1&&e.indexOf("Gecko/")!==-1){if(!window.controllers){window.controllers={}}if(!navigator.product){navigator.product="Gecko"}}}catch(t){}})()</script>
Loading party... \ No newline at end of file
diff --git a/examples/org.eclipse.rap.design.example/body.html b/examples/org.eclipse.rap.design.example/body.html
new file mode 100644
index 0000000000..7326627f2c
--- /dev/null
+++ b/examples/org.eclipse.rap.design.example/body.html
@@ -0,0 +1 @@
+<script type="text/javascript">(function(){try{var e=navigator.userAgent;if(e.indexOf("like Gecko")===-1&&e.indexOf("Gecko/")!==-1){if(!window.controllers){window.controllers={}}if(!navigator.product){navigator.product="Gecko"}}}catch(t){}})()</script> \ No newline at end of file
diff --git a/examples/org.eclipse.rap.design.example/build.properties b/examples/org.eclipse.rap.design.example/build.properties
index 70842b3192..e616350c4b 100644
--- a/examples/org.eclipse.rap.design.example/build.properties
+++ b/examples/org.eclipse.rap.design.example/build.properties
@@ -17,6 +17,7 @@ bin.includes = META-INF/,\
plugin.xml,\
plugin.properties,\
img/,\
- about.html
+ about.html,\
+ body.html
src.includes = about.html
jars.compile.order = .
diff --git a/examples/org.eclipse.rap.design.example/plugin.xml b/examples/org.eclipse.rap.design.example/plugin.xml
index d51572972f..ee9749bdde 100644
--- a/examples/org.eclipse.rap.design.example/plugin.xml
+++ b/examples/org.eclipse.rap.design.example/plugin.xml
@@ -17,6 +17,7 @@
<extension
point="org.eclipse.rap.ui.branding">
<branding
+ body="body.html"
favicon="img/business/favicon.png"
id="org.eclipse.rap.design.example.business.branding"
themeId="org.eclipse.rap.design.example.business.theme"
@@ -32,6 +33,7 @@
</presentationFactory>
</branding>
<branding
+ body="body.html"
favicon="img/fancy/favicon.png"
id="org.eclipse.rap.design.example.fancy.branding"
themeId="org.eclipse.rap.design.example.fancy.theme"
diff --git a/examples/org.eclipse.rap.examples/src/org/eclipse/rap/examples/internal/ExampleApplication.java b/examples/org.eclipse.rap.examples/src/org/eclipse/rap/examples/internal/ExampleApplication.java
index 7887308f26..b0c2cb13ae 100644
--- a/examples/org.eclipse.rap.examples/src/org/eclipse/rap/examples/internal/ExampleApplication.java
+++ b/examples/org.eclipse.rap.examples/src/org/eclipse/rap/examples/internal/ExampleApplication.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 EclipseSource and others.
+ * Copyright (c) 2012, 2014 EclipseSource and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,9 +31,19 @@ import org.osgi.framework.FrameworkUtil;
public class ExampleApplication implements ApplicationConfiguration {
+ // Bug 433179 - RAP application does not start in Firefox 29
+ private static final String FF29_COMPATIBILITY
+ = "<script type=\"text/javascript\">"
+ + "(function(){try{var e=navigator.userAgent;"
+ + "if(e.indexOf(\"like Gecko\")===-1&&e.indexOf(\"Gecko/\")!==-1)"
+ + "{if(!window.controllers){window.controllers={}}"
+ + "if(!navigator.product){navigator.product=\"Gecko\"}}}catch(t){}})()"
+ + "</script>";
+
public void configure( Application application ) {
Map<String, String> properties = new HashMap<String, String>();
properties.put( WebClient.PAGE_TITLE, "RAP Examples" );
+ properties.put( WebClient.HEAD_HTML, FF29_COMPATIBILITY );
properties.put( WebClient.BODY_HTML, readTextFromResource( "resources/body.html", "UTF-8" ) );
properties.put( WebClient.FAVICON, "icons/favicon.png" );
application.setOperationMode( OperationMode.SWT_COMPATIBILITY );
diff --git a/features/org.eclipse.rap.examples.feature/feature.properties b/features/org.eclipse.rap.examples.feature/feature.properties
index ca60f51e67..d2a08db01b 100644
--- a/features/org.eclipse.rap.examples.feature/feature.properties
+++ b/features/org.eclipse.rap.examples.feature/feature.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2007, 2013 Innoopract Informationssysteme GmbH and others.
+# Copyright (c) 2007, 2014 Innoopract Informationssysteme GmbH and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@ Include it in your target platform to develop RAP applications.\n\
*** DO NOT INSTALL IN YOUR IDE ***
copyright = \
-Copyright (c) 2007, 2013 Innoopract Informationssysteme GmbH and others.\n\
+Copyright (c) 2007, 2014 Innoopract Informationssysteme GmbH and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\

Back to the top