#2904 renamed JavaScript vaadin.toolkitConfigurations to vaadin.vaadinConfigurations

svn changeset:7852/svn branch:6.0

diff --git a/WebContent/multiapp.html b/WebContent/multiapp.html
index ace7231d5d90afe7f5eac706bb64020e3f78134a..4731ec1ccf8a9bdec58ed4d69fd595d55176f3c9 100644 (file)
--- a/WebContent/multiapp.html
+++ b/WebContent/multiapp.html
@@ -4,7 +4,7 @@
 <title>Multiple embedded applications</title>
 <script type="text/javascript">
        var vaadin = {
-               toolkitConfigurations: {
+               vaadinConfigurations: {
                        'fb' :{
                                appUri:'/FeatureBrowser', 
                                pathInfo: '/', 

diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
index 9fa9e19019ee750d9b6f3069edd65f59e5d08368..0ab80610ccc5eda203a999baa75627e1a8d5e4fd 100644 (file)
--- 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 716194e618c3a5901936d416cee0a277c27022a4..f613a2b6fe8182c84a59587d8dd866dea63c8f70 100644 (file)
--- 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()) {