Reviewers: jasvir,
Description:
this removes all refs to valija/cajita from the playground.
Please review this at http://codereview.appspot.com/4295064/
Affected files:
M src/com/google/caja/demos/playground/Playground.html
M src/com/google/caja/demos/playground/client/policy.js
M src/com/google/caja/demos/playground/client/ui/PlaygroundView.java
D src/com/google/caja/demos/playground/setup-valija.js
M src/com/google/caja/demos/playground/taming.js
Index: src/com/google/caja/demos/playground/setup-valija.js
===================================================================
--- src/com/google/caja/demos/playground/setup-valija.js (revision 4403)
+++ src/com/google/caja/demos/playground/setup-valija.js (working copy)
@@ -1,5 +0,0 @@
-(function(){
- var imports = ___.getNewModuleHandler().getImports();
- imports.loader = {provide:___.markFuncFreeze(function(v){valijaMaker =
v;})};
- imports.outers = imports;
-})();
Index: src/com/google/caja/demos/playground/Playground.html
===================================================================
--- src/com/google/caja/demos/playground/Playground.html (revision 4403)
+++ src/com/google/caja/demos/playground/Playground.html (working copy)
@@ -32,24 +32,12 @@
</head>
<body>
<!-- Load scripts in body so that document.body is available in IE 6
-->
- <script type="text/javascript" src="json_sans_eval.js"></script>
- <script type="text/javascript" src="cajita.js"></script>
- <script type="text/javascript" src="cajita-debugmode.js"></script>
- <script type="text/javascript" src="unicode.js"></script>
- <script type="text/javascript" src="css-defs.js"></script>
<script type="text/javascript" src="html4-defs.js"></script>
- <script type="text/javascript" src="html-sanitizer.js"></script>
- <script type="text/javascript" src="html-emitter.js"></script>
- <script type="text/javascript" src="setup-valija.js"></script>
- <script type="text/javascript" src="bridal.js"></script>
- <script type="text/javascript" src="cssparser.js"></script>
- <script type="text/javascript" src="domita.js"></script>
<script type="text/javascript" src="prettify.js"></script>
<script type="text/javascript" src="lang-css.js"></script>
<script type="text/javascript"
src="http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js";></script>
<script type="text/javascript" src="testbed.js"></script>
<script type="text/javascript" src="taming.js"></script>
- <script type="text/javascript" src="valija.out.js"></script>
<script type="text/javascript" src="js/codemirror.js"></script>
<script type="text/javascript"
src="playground/playground.nocache.js"></script>
Index: src/com/google/caja/demos/playground/taming.js
===================================================================
--- src/com/google/caja/demos/playground/taming.js (revision 4403)
+++ src/com/google/caja/demos/playground/taming.js (working copy)
@@ -19,7 +19,6 @@
* @author Jasvir Nagra ([email protected])
* @requires document, window
* @requires swfobject
- * @requires ___, attachDocumentStub, cajita
* @provides caja___, tamings___
*/
var tamings___ = tamings___ || [];
@@ -53,21 +52,6 @@
parent.appendChild(gadgetRoot);
}
- function enableCajita(parent, policy, html, js) {
- configureHTML(parent, html);
- var gadgetRoot = document.getElementById(id);
- var imports = ___.copy(___.sharedImports);
- imports.outers = imports;
- attachDocumentStub('-' + id, uriPolicy, imports, gadgetRoot);
- imports.htmlEmitter___ = new HtmlEmitter(gadgetRoot, imports.document);
- imports.$v = valijaMaker.CALL___(imports.outers);
- ___.setLogFunc(function(x) { caja___.logFunc(x); })
- ___.getNewModuleHandler().setImports(imports);
- eval(policy);
- grantAdditionalPowers(tamings___, ___, imports);
- eval(js);
- }
-
var cachedImports;
function reset() {
cachedImports = undefined;
@@ -110,11 +94,7 @@
function enable(es53, parent, policy, html, js, callback, cache) {
tearDownES53();
- if (es53) {
- enableES53(parent, policy, html, js, callback, cache);
- } else {
- enableCajita(parent, policy, html, js, callback, cache);
- }
+ enableES53(parent, policy, html, js, callback, cache);
}
function onReady(api, frameElement) {
Index: src/com/google/caja/demos/playground/client/policy.js
===================================================================
--- src/com/google/caja/demos/playground/client/policy.js (revision 4403)
+++ src/com/google/caja/demos/playground/client/policy.js (working copy)
@@ -51,9 +51,8 @@
},
/**
- * Converts a valija object (since the host page is valija)
- * generated by flash (so everything's
writable/enumerable/configurable)
- * into an ES5/3 object.
+ * Converts a host page object generated by Flash (so everything's
+ * writable/enumerable/configurable) into an ES5/3 object.
*/
tame: function tame(obj) {
var result, i;
@@ -189,7 +188,7 @@
* Throttled alert taming
* - exposes a taming of the alert function
* - ensures that after 10 alerts the user has the option of redirecting
- * remaining calls to alert to cajita.log instead
+ * remaining calls to alert to cajaVM.log instead
*/
tamings___.push(function tameAlert(___, imports) {
imports.outers.alert = (function() {
Index: src/com/google/caja/demos/playground/client/ui/PlaygroundView.java
===================================================================
--- src/com/google/caja/demos/playground/client/ui/PlaygroundView.java
(revision 4403)
+++ src/com/google/caja/demos/playground/client/ui/PlaygroundView.java
(working copy)
@@ -378,7 +378,7 @@
}-*/;
private native String getRenderResult() /*-{
- return "" + $wnd.___.getNewModuleHandler().getLastValue();
+ return ""; // TODO(felix8a): fix for es53
}-*/;
public void addCompileMessage(String item) {
