Bug 350098 - [hovering] "Enrich on click" is not working

3 files changed, 8 insertions, 4 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java
index 3e7a4acca9..9948cf5e14 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java
@@ -632,6 +632,9 @@ public String getBrowserType () {
 /**
  * Returns <code>true</code> if javascript will be allowed to run in pages
  * subsequently viewed in the receiver, and <code>false</code> otherwise.
+ * Note that this may not reflect the javascript enablement on the currently-
+ * viewed page if <code>setJavascriptEnabled()</code> has been invoked during
+ * its lifetime.
  *
  * @return the receiver's javascript enabled state
  *
@@ -646,7 +649,7 @@ public String getBrowserType () {
  */
 public boolean getJavascriptEnabled () {
 	checkWidget();
-	return webBrowser.jsEnabled;
+	return webBrowser.jsEnabledOnNextPage;
 }
 
 public int getStyle () {
@@ -972,8 +975,7 @@ public void removeVisibilityWindowListener (VisibilityWindowListener listener) {
  */
 public void setJavascriptEnabled (boolean enabled) {
 	checkWidget();
-	webBrowser.jsEnabled = enabled;
-	webBrowser.jsEnabledChanged = true;
+	webBrowser.jsEnabledOnNextPage = enabled;
 }
 
 /**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java
index d3ac919656..e69773bd86 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java
@@ -26,7 +26,7 @@ abstract class WebBrowser {
 	StatusTextListener[] statusTextListeners = new StatusTextListener[0];
 	TitleListener[] titleListeners = new TitleListener[0];
 	VisibilityWindowListener[] visibilityWindowListeners = new VisibilityWindowListener[0];
-	boolean jsEnabledChanged, jsEnabled = true;
+	boolean jsEnabledOnNextPage = true, jsEnabled = true;
 	int nextFunctionIndex = 1;
 	Object evaluateResult;
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
index a312752748..f1c407e6be 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
@@ -656,6 +656,8 @@ public void create(Composite parent, int style) {
 						break;
 					}
 					case NavigateComplete2: {
+						jsEnabled = jsEnabledOnNextPage;
+
 						Variant varResult = event.arguments[1];
 						String url = varResult.getString();
 						if (!performingInitialNavigate) {