Reviewers: felix8a,
Description:
* copies html-sanitizer-minified.js as well as html-sanitizer.js
* Changes alert back to real alert (the GWT version is async and can be
confusing when debugging)
Please review this at http://codereview.appspot.com/5674063/
Affected files:
M build.xml
M src/com/google/caja/demos/playground/client/ui/PlaygroundView.java
Index: src/com/google/caja/demos/playground/client/ui/PlaygroundView.java
===================================================================
--- src/com/google/caja/demos/playground/client/ui/PlaygroundView.java
(revision 4778)
+++ src/com/google/caja/demos/playground/client/ui/PlaygroundView.java
(working copy)
@@ -459,24 +459,6 @@
playgroundUI.renderResult.setText(result);
}
- private void alert(String msg) {
- final DialogBox alertBox = new DialogBox();
- alertBox.setGlassEnabled(true);
- alertBox.setText("Cajoled gadget says");
- DockLayoutPanel dock = new DockLayoutPanel(Unit.PX);
- dock.add(new ScrollPanel(new Label(msg)));
- dock.addSouth(new Button("Ok", new ClickHandler() {
- @Override
- public void onClick(ClickEvent arg0) {
- alertBox.hide();
- }
- }), 20);
- dock.setSize("200px", "200px");
- alertBox.add(dock);
- alertBox.center();
- alertBox.show();
- }
-
private native void augmentWith(JavaScriptObject o, String key,
JavaScriptObject value) /*-{
o[key] = value;
@@ -507,11 +489,9 @@
[email protected]::addRuntimeMessage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)
(message, source, lineNum);
}));
- extraImports.alert = caja.tame(caja.markFunction(
- function (message) {
-
[email protected]::alert(Ljava/lang/String;)
- ('' + message);
- }));
+ extraImports.alert = caja.tame(
+ caja.markFunction(
+ function(msg) { alert('Untrusted code says: ' + String(msg)); }));
return extraImports;
}-*/;
Index: build.xml
===================================================================
--- build.xml (revision 4779)
+++ build.xml (working copy)
@@ -1217,6 +1217,7 @@
<include name="css-defs.js" />
<include name="html4-defs.js" />
<include name="domado.out.js" />
+ <include name="html-sanitizer-minified.js" />
<include name="taming-membrane.out.js" />
</fileset>
<fileset dir="${third_party}/js/excanvas">
