]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ed22e15)
small changes
authorMatti Tahvonen <matti.tahvonen@itmill.com>
Fri, 8 Jun 2007 08:20:06 +0000 (08:20 +0000)
committerMatti Tahvonen <matti.tahvonen@itmill.com>
Fri, 8 Jun 2007 08:20:06 +0000 (08:20 +0000)
svn changeset:1649/svn branch:trunk

src/com/itmill/toolkit/terminal/web/AjaxJsonPaintTarget.java patch | blob | history
src/com/itmill/toolkit/terminal/web/ApplicationServlet.java patch | blob | history

diff --git a/src/com/itmill/toolkit/terminal/web/AjaxJsonPaintTarget.java b/src/com/itmill/toolkit/terminal/web/AjaxJsonPaintTarget.java
index d4e5233c04a275d4808487722428a69ac4c4d9e8..073636d76c97cdf684b71bb5a3eca8bea56348d9 100644 (file)
--- a/src/com/itmill/toolkit/terminal/web/AjaxJsonPaintTarget.java
+++ b/src/com/itmill/toolkit/terminal/web/AjaxJsonPaintTarget.java
@@ -410,7 +410,7 @@ public class AjaxJsonPaintTarget implements PaintTarget, AjaxPaintTarget {
         *             if the paint operation failed.
         */
        public void addAttribute(String name, int value) throws PaintException {
-               tag.addAttribute(name + ":" + String.valueOf(value));
+               tag.addAttribute("\"" + name + "\":" + String.valueOf(value));
        }
 
        /**
@@ -426,7 +426,7 @@ public class AjaxJsonPaintTarget implements PaintTarget, AjaxPaintTarget {
         *             if the paint operation failed.
         */
        public void addAttribute(String name, long value) throws PaintException {
-               tag.addAttribute(name + ":" + String.valueOf(value));
+               tag.addAttribute("\"" + name + "\":" + String.valueOf(value));
        }
 
        /**
@@ -584,7 +584,7 @@ public class AjaxJsonPaintTarget implements PaintTarget, AjaxPaintTarget {
 
                // Escape and write what was given
                if (xml != null)
-                       tag.addData(xml);
+                       tag.addData("\""+escapeJSON(xml)+"\"");
 
        }
 
diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
index b8748a03312b9da5728560fa70c21b85327dcc23..0e32f5812c7973c5de8db954e7a373b238f1a06b 100644 (file)
--- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
@@ -905,8 +905,7 @@ public class ApplicationServlet extends HttpServlet implements
                                "<body>\n<script language=\"javascript\" src=\"/tk/com.itmill.toolkit.terminal.gwt.Client/gwt.js\"></script>\n" +
                                "       <iframe id=\"__gwt_historyFrame\" style=\"width:0;height:0;border:0\"></iframe>\n" +
                                "       <div id=\"itmtk-ajax-window\"></div>" +
-                               "       <div id=\"itmtk-loki\" style=\"position: absolute; width: 100%; margin: 0px; left: 0px; height: 200px; bottom: 0px; border-top: 1px solid gray; background-color: #f6f6f6; overflow: scroll; font-size: x-small;color:red !important;\"></div>\n" + 
-                               "       <div style=\"position: absolute; right: 25px; height: 195px; bottom: 0px; color: gray; \"><strong>console</strong></div>\n" + 
+                               "       <div id=\"itmtk-loki\" style=\"width: 100%; margin-top: 50px; left: 0px; height: 200px; border-top: 1px solid gray; background-color: #f6f6f6; overflow: scroll; font-size: x-small;color:red !important;\"></div>\n" + 
                                "       <div style=\"position: absolute; right: 5px; top: 5px; color: gray;\"><strong>IT Mill Toolkit 5 Prototype</strong></div>\n" + 
                                "       </body>\n" + 
                                "</html>\n");
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework