Fix bug in Super Dev Mode where the "Compile" button was disabled when
running a static GWT app directly from the code server.
(Forgot to move the computeScriptBaseJs config property.)
Review by: cromwellian@google.com
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@11031 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java
index 2efb702..73cd65c 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java
@@ -172,6 +172,10 @@
"com/google/gwt/core/ext/linker/impl/installScriptDirect.js");
overrideConfig(moduleDef, "installCode", "false");
+ // override computeScriptBase.js to enable the "Compile" button
+ overrideConfig(moduleDef, "computeScriptBaseJs",
+ "com/google/gwt/dev/codeserver/computeScriptBase.js");
+
// If present, set some config properties back to defaults.
// (Needed for Google's server-side linker.)
maybeOverrideConfig(moduleDef, "includeBootstrapInPrimaryFragment", "false");
@@ -179,8 +183,6 @@
"com/google/gwt/core/ext/linker/impl/permutations.js");
maybeOverrideConfig(moduleDef, "propertiesJs",
"com/google/gwt/core/ext/linker/impl/properties.js");
- maybeOverrideConfig(moduleDef, "computeScriptBaseJs",
- "com/google/gwt/dev/codeserver/computeScriptBase.js");
for (Map.Entry<String, String> entry : bindingProperties.entrySet()) {
String propName = entry.getKey();
diff --git a/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java b/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
index 4a3e2fa..baacf86 100644
--- a/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
+++ b/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
@@ -208,7 +208,8 @@
* @param context a LinkerContext
*/
protected String getJsComputeScriptBase(LinkerContext context) {
- return "com/google/gwt/core/ext/linker/impl/computeScriptBase.js";
+ return getStringConfigurationProperty(context, "computeScriptBaseJs",
+ "com/google/gwt/core/ext/linker/impl/computeScriptBase.js");
}
/**
diff --git a/user/src/com/google/gwt/core/CrossSiteIframeLinker.gwt.xml b/user/src/com/google/gwt/core/CrossSiteIframeLinker.gwt.xml
index e98d777..b988b19 100644
--- a/user/src/com/google/gwt/core/CrossSiteIframeLinker.gwt.xml
+++ b/user/src/com/google/gwt/core/CrossSiteIframeLinker.gwt.xml
@@ -22,6 +22,7 @@
<define-configuration-property name="devModeRedirectEnabled" is_multi_valued="false"/>
<define-configuration-property name="installScriptJs" is-multi-valued="false" />
<define-configuration-property name="installCode" is-multi-valued="false" />
+ <define-configuration-property name="computeScriptBaseJs" is-multi-valued="false" />
<set-configuration-property name="xsiframe.failIfScriptTag" value="TRUE"/>
