summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHenri Sara <henri.sara@itmill.com>2009-05-18 10:53:13 +0000
committerHenri Sara <henri.sara@itmill.com>2009-05-18 10:53:13 +0000
commiteeb91b4948125247c06ba85cd16b1fb03df1ceac (patch)
tree74f06b3d64cbae87692f8559219d5ffa876524f3 /src
parent09680719694038a45cab504d3bcc90f70a9cfee9 (diff)
downloadvaadin-framework-eeb91b4948125247c06ba85cd16b1fb03df1ceac.tar.gz
vaadin-framework-eeb91b4948125247c06ba85cd16b1fb03df1ceac.zip
#2904 renamed JavaScript vaadin.toolkitConfigurations to vaadin.vaadinConfigurations
svn changeset:7852/svn branch:6.0
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java6
-rw-r--r--src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java12
2 files changed, 9 insertions, 9 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
index 9fa9e19019..0ab80610cc 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
@@ -74,8 +74,8 @@ public class ApplicationConfiguration {
/*-{
var id = this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::id;
- if($wnd.vaadin.toolkitConfigurations && $wnd.vaadin.toolkitConfigurations[id]) {
- var jsobj = $wnd.vaadin.toolkitConfigurations[id];
+ if($wnd.vaadin.vaadinConfigurations && $wnd.vaadin.vaadinConfigurations[id]) {
+ var jsobj = $wnd.vaadin.vaadinConfigurations[id];
var uri = jsobj.appUri;
if(uri[uri.length -1] != "/") {
uri = uri + "/";
@@ -173,7 +173,7 @@ public class ApplicationConfiguration {
private native static void loadAppIdListFromDOM(ArrayList<String> list)
/*-{
var j;
- for(j in $wnd.vaadin.toolkitConfigurations) {
+ for(j in $wnd.vaadin.vaadinConfigurations) {
list.@java.util.Collection::add(Ljava/lang/Object;)(j);
}
}-*/;
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 716194e618..f613a2b6fe 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -1216,16 +1216,16 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
+ "'></script>\n");
page.write("<script type=\"text/javascript\">\n");
page.write("//<![CDATA[\n");
- page.write("if(!vaadin || !vaadin.toolkitConfigurations) {\n "
+ page.write("if(!vaadin || !vaadin.vaadinConfigurations) {\n "
+ "if(!vaadin) { var vaadin = {}} \n"
- + "vaadin.toolkitConfigurations = {};\n"
+ + "vaadin.vaadinConfigurations = {};\n"
+ "vaadin.themesLoaded = {}};\n");
if (!isProductionMode()) {
page.write("vaadin.debug = true;\n");
}
- page.write("vaadin.toolkitConfigurations[\"" + appId + "\"] = {");
+ page.write("vaadin.vaadinConfigurations[\"" + appId + "\"] = {");
page.write("appUri:'" + appUrl + "', ");
page.write("pathInfo: '" + pathInfo + "', ");
if (window != application.getMainWindow()) {
@@ -1282,9 +1282,9 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
} else {
page.write("<script type=\"text/javascript\">\n");
page.write("//<![CDATA[\n");
- page.write("if(!vaadin || !vaadin.toolkitConfigurations) {\n "
+ page.write("if(!vaadin || !vaadin.vaadinConfigurations) {\n "
+ "if(!vaadin) { var vaadin = {}} \n"
- + "vaadin.toolkitConfigurations = {};\n"
+ + "vaadin.vaadinConfigurations = {};\n"
+ "vaadin.themesLoaded = {};\n");
if (!isProductionMode()) {
page.write("vaadin.debug = true;\n");
@@ -1298,7 +1298,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
+ widgetset + "/" + widgetset + ".nocache.js?"
+ new Date().getTime() + "'><\\/script>\");\n}\n");
- page.write("vaadin.toolkitConfigurations[\"" + appId + "\"] = {");
+ page.write("vaadin.vaadinConfigurations[\"" + appId + "\"] = {");
page.write("appUri:'" + appUrl + "', ");
page.write("pathInfo: '" + pathInfo + "', ");
if (window != application.getMainWindow()) {