Merge pull request #61 from gmetais/develop

V1.3.1

front/src/css/timeline.css

@@ -306,3 +306,9 @@
   color: #e74c3c;
   cursor: pointer;
 }
+.warningsFilterOn > div {
+  display: none;
+}
+.warningsFilterOn > div.warning {
+  display: table-row;
+}

front/src/js/controllers/timelineCtrl.js

@@ -166,7 +166,6 @@ timelineCtrl.directive('scrollOnClick', ['$animate', '$timeout', function($anima
 
 
                 window.scrollTo(0, lineElement[0].offsetTop);
-                console.log(lineElement[0]);
             });
         }
     };

front/src/js/directives/offendersDirectives.js

@@ -157,13 +157,14 @@
 
     function getJQueryHTML(node, onASingleLine) {
         var type = node.data.type;
-        var args = node.data.callDetails.arguments;
+        var unescapedArgs = node.data.callDetails.arguments;
+        var args = [];
         var ctxt = node.data.callDetails.context;
         
         // escape HTML in args
         for (var i = 0 ; i < 4 ; i ++) {
-            if (args[i]) {
-                args[i] = escapeHTML(args[i]);
+            if (unescapedArgs[i]) {
+                args[i] = escapeHTML(unescapedArgs[i]);
             }
         }
 
@@ -706,7 +707,7 @@
                 index: '=',
                 node: '='
             },
-            template: '<div id="line_{{index}}"></div>',
+            template: '<div></div>',
             replace: true,
             link: function(scope, element) {
                 
@@ -717,6 +718,11 @@
                 }
 
                 element.append(getProfilerLineHTML(scope.index, scope.node));
+                element[0].id = 'line_' + scope.index;
+
+                if (scope.node.warning || scope.node.error) {
+                    element[0].classList.add('warning');
+                }
 
                 // Bind click on the details icon
                 var detailsIcon = element[0].querySelector('.details div');

front/src/less/timeline.less

@@ -345,4 +345,12 @@
 .execution .icon-warning {
     color: #e74c3c;
     cursor: pointer;
+}
+.warningsFilterOn {
+    > div {
+        display: none;
+        &.warning {
+            display: table-row;
+        }
+    }
 }

front/src/views/timeline.html

@@ -64,7 +64,7 @@
             <label for="warningsFilterOn">Show warnings only</label>
         </div>
     </div>
-    <div class="table">
+    <div class="table" ng-class="{warningsFilterOn: warningsFilterOn}">
         <div class="headers">
             <div><!-- index --></div>
             <div>Type</div>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yellowlabtools",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Online tool to audit a webpage for performance and front-end quality issues",
   "repository": {
     "type": "git",

server_config/server_install.sh

@@ -30,4 +30,4 @@ grunt build
 # Start the server
 rm server_config/settings.json
 cp server_config/settings-prod.json server_config/settings.json
-NODE_ENV=production forever start -c "node --stack-size=65500" bin/server.js
+NODE_ENV=production forever start -c "node --stack-size=262000" bin/server.js

server_config/server_update.sh

@@ -23,4 +23,4 @@ npm install phantomjs -g
 grunt build
 
 # Restart the server
-NODE_ENV=production forever start -c "node --stack-size=65500" bin/server.js
+NODE_ENV=production forever start -c "node --stack-size=262000" bin/server.js