Bug 1133288 - Remove nonstandard expression closures from editor. r=e…

…hsan
dothq · Jan 25, 2015 · 48957d0 · 48957d0
1 parent 01c1407
commit 48957d0
Show file tree

Hide file tree

Showing 5 changed files with 119 additions and 119 deletions.
diff --git a/editor/composer/test/test_bug519928.html b/editor/composer/test/test_bug519928.html
@@ -19,15 +19,16 @@
 
 var iframe = document.getElementById("load-frame");
 
-function enableJS() allowJS(true, iframe);
-function disableJS() allowJS(false, iframe);
+function enableJS() { allowJS(true, iframe); }
+function disableJS() { allowJS(false, iframe); }
 function allowJS(allow, frame) {
   SpecialPowers.wrap(frame.contentWindow)
                .QueryInterface(SpecialPowers.Ci.nsIInterfaceRequestor)
                .getInterface(SpecialPowers.Ci.nsIWebNavigation)
                .QueryInterface(SpecialPowers.Ci.nsIDocShell)
                .allowJavascript = allow;
 }
+
 function expectJSAllowed(allowed, testCondition, callback) {
   window.ICanRunMyJS = false;
   var self_ = window;
@@ -49,8 +50,8 @@
 
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(function() {
-  var enterDesignMode = function() document.designMode = "on";
-  var leaveDesignMode = function() document.designMode = "off";
+  var enterDesignMode = function() { document.designMode = "on"; };
+  var leaveDesignMode = function() { document.designMode = "off"; };
   expectJSAllowed(false, disableJS, function() {
     expectJSAllowed(true, enableJS, function() {
       expectJSAllowed(true, enterDesignMode, function() {
@@ -59,8 +60,8 @@
             expectJSAllowed(false, enterDesignMode, function() {
               expectJSAllowed(false, leaveDesignMode, function() {
                 expectJSAllowed(true, enableJS, function() {
-                  enterDesignMode = function() iframe.contentDocument.designMode = "on";
-                  leaveDesignMode = function() iframe.contentDocument.designMode = "off";
+                  enterDesignMode = function() { iframe.contentDocument.designMode = "on"; };
+                  leaveDesignMode = function() { iframe.contentDocument.designMode = "off"; };
                   expectJSAllowed(false, disableJS, function() {
                     expectJSAllowed(true, enableJS, function() {
                       expectJSAllowed(true, enterDesignMode, function() {
@@ -120,4 +121,3 @@
 </pre>
 </body>
 </html>
-
diff --git a/editor/libeditor/tests/test_CF_HTML_clipboard.html b/editor/libeditor/tests/test_CF_HTML_clipboard.html
@@ -45,7 +45,7 @@
 
     var flavors = [CF_HTML];
     if (!cb.hasDataMatchingFlavors(flavors, flavors.length, cb.kGlobalClipboard)) {
-      setTimeout(function() copyCF_HTML_worker(success, failure), 100);
+      setTimeout(function() { copyCF_HTML_worker(success, failure); }, 100);
       return;
     }
 
@@ -59,7 +59,7 @@
       trans.getTransferData(CF_HTML, data, {});
       data = SpecialPowers.wrap(data).value.QueryInterface(Ci.nsISupportsCString).data;
     } catch (e) {
-      setTimeout(function() copyCF_HTML_worker(success, failure), 100);
+      setTimeout(function() { copyCF_HTML_worker(success, failure); }, 100);
       return;
     }
     success();