Merge branch 'zombie-164-use-strict'

mozilla · Sep 30, 2014 · f8ba736 · f8ba736
2 parents 3197aca + 1521d22
commit f8ba736
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 16 deletions.
diff --git a/client/js/experimentctrl.js b/client/js/experimentctrl.js
@@ -1,3 +1,5 @@
+"use strict";
+
 scanjsModule.controller('ExperimentCtrl', ['$scope', 'ScanSvc', function ExperimentCtrl($scope, ScanSvc) {
   if (!document.getElementById("experiment-mirror").children.length) {
     $scope.codeMirror = new CodeMirror(document.getElementById('experiment-mirror'), {

diff --git a/client/js/locationctrl.js b/client/js/locationctrl.js
@@ -1,3 +1,5 @@
+"use strict";
+
 scanjsModule.controller('LocationCtrl', ['$scope', '$location', function LocationCtrl($scope, $location) {
   $scope.tabBtnClass = function (page) {
     var current = $location.path().substring(1) || 'scan';

diff --git a/client/js/main.js b/client/js/main.js
@@ -1,3 +1,5 @@
+"use strict";
+
 var scanjsModule = angular.module('scanjs', ['ui.bootstrap', 'ngRoute']);
 
 scanjsModule.config(['$routeProvider',

diff --git a/client/js/rulesctrl.js b/client/js/rulesctrl.js
@@ -1,3 +1,5 @@
+"use strict";
+
 scanjsModule.controller('RuleListCtrl', ['$scope', 'ScanSvc', function RuleListCtrl($scope, ScanSvc) {
   $scope.rulesFile = "../common/rules.json";
   $scope.rules = []; //JSON rules object

diff --git a/client/js/scanctrl.js b/client/js/scanctrl.js
@@ -1,3 +1,5 @@
+"use strict";
+
 scanjsModule.controller('ScanCtrl', ['$scope', 'ScanSvc', function ScanCtrl($scope, ScanSvc) {
   if (!document.getElementById("codeMirrorDiv").children.length) {
   $scope.codeMirror = new CodeMirror(document.getElementById('codeMirrorDiv'), {
@@ -35,7 +37,7 @@ scanjsModule.controller('ScanCtrl', ['$scope', 'ScanSvc', function ScanCtrl($sco
     $scope.inputFiles.forEach(function (scriptFile, i) {
       if (document.getElementById('doScan_'+i).checked) {
         pending++;
-	$scope.throbOutput = true;
+        $scope.throbOutput = true;
         ScanSvc.newScan(scriptFile.name,scriptFile.asText());
       }
     });
@@ -62,19 +64,19 @@ scanjsModule.controller('ScanCtrl', ['$scope', 'ScanSvc', function ScanCtrl($sco
     }, []);
   }
 
-  $scope.filterResults=function(issue){
-    if(!issue){
+  $scope.filterResults=function(issue) {
+    if (!issue) {
       $scope.filteredResults=$scope.results;
     }
-    else{
-      if(typeof issue.name != "undefined") {
-	$scope.filteredResults=$scope.results.filter(function(result){
-	  return result.filename === issue.name;
-	});
-      }else {
-	$scope.filteredResults=$scope.results.filter(function(result){
-	  return result.rule.name == issue;
-	});
+    else {
+      if (typeof issue.name != "undefined") {
+        $scope.filteredResults = $scope.results.filter(function(result) {
+          return result.filename === issue.name;
+        });
+      } else {
+        $scope.filteredResults = $scope.results.filter(function(result) {
+          return result.rule.name == issue;
+        });
       }
     }
   }

diff --git a/client/js/scanservice.js b/client/js/scanservice.js
@@ -1,3 +1,5 @@
+"use strict";
+
 scanjsModule.factory('ScanSvc', ['$rootScope', '$http', function($rootScope, $http) {
   var ScanService = {
     //results:[],

diff --git a/client/js/scanworker.js b/client/js/scanworker.js
@@ -1,3 +1,5 @@
+"use strict";
+
 /* this makes sure that console.log can be used, even if it is undefined.
    We won't see the message though, since this kind of postMessage isn't handled in scanservice.js  */
 if (typeof console === "undefined") {

diff --git a/common/scan.js b/common/scan.js
@@ -17,6 +17,7 @@
   // Plain browser env
   mod(this.ScanJS || (this.ScanJS = {}), this.acorn.walk);
 })(function (exports, walk) {
+  "use strict";
 
   // Default parser, override this object to change*
   // needs parser.parse to produce an AST
@@ -328,7 +329,7 @@
 
     var nodeTests = {};
     //each node type may have multiple tests, so first create arrays of test funcs
-    for (i in rulesData) {
+    for (var i in rulesData) {
       var rule = rulesData[i];
       //parse rule source
       var template;
@@ -364,7 +365,7 @@
 
     rules = {};
     //create a single function for each nodeType, which calls all the test functions
-    for (nodeType in nodeTests) {
+    for (var nodeType in nodeTests) {
       rules[nodeType] = function (tests, node) {
         tests.forEach(function (test) {
           test.call(this, node);
@@ -401,8 +402,8 @@
     aw_found_callback = found_callback;
   }
 
-  function aw_setParser(parserName){
-      parser = parserName ;
+  function aw_setParser(newParser){
+    parser = newParser;
   }
 
   exports.rules = rules;