From aeb1da74fe77e80f693ef4cd7a07e054b5e10fb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20M=C3=A9tais?= <gael.metais@gmail.com>
Date: Thu, 18 Sep 2014 16:43:11 +0200
Subject: [PATCH] Small adjustments in notations

---
 app/node_views/results.html       | 9 ++++++---
 app/public/scripts/resultsCtrl.js | 9 +++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/node_views/results.html b/app/node_views/results.html
index 000d825..064fe1a 100644
--- a/app/node_views/results.html
+++ b/app/node_views/results.html
@@ -93,7 +93,7 @@
                     </div>
                 </div>
                 <div>
-                    <div ng-class="notations.badPractices">{{notations.badPractices}}</div>
+                    <div ng-class="notations.jsBadPractices">{{notations.jsBadPractices}}</div>
                     <div class="notation">Bad Javascript</div>
                     <div class="criteria">
                         <ul>
@@ -109,12 +109,15 @@
                             <li ng-if="phantomasResults.metrics.consoleMessages">
                                 Console messages: {{phantomasResults.metrics.consoleMessages}}
                             </li>
+                            <li ng-if="phantomasResults.metrics.globalVariables">
+                                Global variables: {{phantomasResults.metrics.globalVariables}}
+                            </li>
                         </ul>
                     </div>
                 </div>
                 <div>
                     <div ng-class="notations.scripts">{{notations.scripts}}</div>
-                    <div class="notation">Scripts loaded</div>
+                    <div class="notation">JS files loaded</div>
                     <div class="criteria">
                         <ul>
                             <li ng-if="phantomasResults.metrics.jsCount">
@@ -186,7 +189,7 @@
                 </div>
                 <div>
                     <div ng-class="notations.cssCount">{{notations.cssCount}}</div>
-                    <div class="notation">CSS loaded</div>
+                    <div class="notation">CSS files loaded</div>
                     <div class="criteria">
                         <ul>
                             <li ng-if="phantomasResults.metrics.cssCount">
diff --git a/app/public/scripts/resultsCtrl.js b/app/public/scripts/resultsCtrl.js
index 3816175..67321ff 100644
--- a/app/public/scripts/resultsCtrl.js
+++ b/app/public/scripts/resultsCtrl.js
@@ -71,7 +71,7 @@ app.controller('ResultsCtrl', function ($scope) {
             domManipulations: getDomManipulationsScore(),
             duplicatedDomQueries: getDuplicatedDomQueriesScore(),
             eventsBound: getEventsBoundScore(),
-            badPractices: getBadPracticesScore(),
+            jsBadPractices: getJSBadPracticesScore(),
             scripts: getScriptsScore(),
             jQueryLoading: getJQueryLoadingScore(),
             cssComplexity: getCSSComplexityScore(),
@@ -241,12 +241,13 @@ app.controller('ResultsCtrl', function ($scope) {
         return note;
     }
 
-    function getBadPracticesScore() {
+    function getJSBadPracticesScore() {
         var note = 'A';
         var score = $scope.phantomasResults.metrics.documentWriteCalls * 3 +
-                    $scope.phantomasResults.metrics.evalCalls * 3 +
+                    $scope.phantomasResults.metrics.evalCalls * 2 +
                     $scope.phantomasResults.metrics.jsErrors * 10 +
-                    $scope.phantomasResults.metrics.consoleMessages;
+                    $scope.phantomasResults.metrics.consoleMessages / 2 +
+                    $scope.phantomasResults.metrics.globalVariables / 10;
         if (score > 5) {
             note = 'B';
         }