diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2007-06-08 08:20:06 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2007-06-08 08:20:06 +0000 |
| commit | 3d9e3b67a312f5e111d2a0e6ed72a261cc227765 (patch) | |
| tree | 0fd0025bfc97f637de55b7d03efb729b5f962836 /src | |
| parent | ed22e15ed7e2aa8d2821481602027b47856b99e8 (diff) | |
| download | vaadin-framework-3d9e3b67a312f5e111d2a0e6ed72a261cc227765.tar.gz vaadin-framework-3d9e3b67a312f5e111d2a0e6ed72a261cc227765.zip | |
small changes
svn changeset:1649/svn branch:trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/itmill/toolkit/terminal/web/AjaxJsonPaintTarget.java | 6 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/terminal/web/ApplicationServlet.java | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/com/itmill/toolkit/terminal/web/AjaxJsonPaintTarget.java b/src/com/itmill/toolkit/terminal/web/AjaxJsonPaintTarget.java index d4e5233c04..073636d76c 100644 --- 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 b8748a0331..0e32f5812c 100644 --- 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"); |