From 9b939aa8b443a2633926ba83e6bf3400f6023210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20M=C3=A9tais?= Date: Wed, 18 Mar 2015 08:06:56 +0100 Subject: [PATCH 1/4] Remove console.log --- front/src/js/controllers/timelineCtrl.js | 1 - 1 file changed, 1 deletion(-) diff --git a/front/src/js/controllers/timelineCtrl.js b/front/src/js/controllers/timelineCtrl.js index 9105831..8f0e83d 100644 --- a/front/src/js/controllers/timelineCtrl.js +++ b/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]); }); } }; From 23d980910de4f3406327fcf1abd969cbcbf1d9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20M=C3=A9tais?= Date: Wed, 18 Mar 2015 08:09:02 +0100 Subject: [PATCH 2/4] Increase stack size --- server_config/server_install.sh | 2 +- server_config/server_update.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server_config/server_install.sh b/server_config/server_install.sh index b22a639..84a22f4 100644 --- a/server_config/server_install.sh +++ b/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 \ No newline at end of file +NODE_ENV=production forever start -c "node --stack-size=262000" bin/server.js \ No newline at end of file diff --git a/server_config/server_update.sh b/server_config/server_update.sh index 58529e7..7ee7e78 100755 --- a/server_config/server_update.sh +++ b/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 \ No newline at end of file +NODE_ENV=production forever start -c "node --stack-size=262000" bin/server.js \ No newline at end of file From f45480c0b93a76fab92a464c8e66951a06330fd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20M=C3=A9tais?= Date: Wed, 18 Mar 2015 08:09:51 +0100 Subject: [PATCH 3/4] Fix bugs with show warnings and some html escaping --- front/src/css/timeline.css | 6 ++++++ front/src/js/directives/offendersDirectives.js | 14 ++++++++++---- front/src/less/timeline.less | 8 ++++++++ front/src/views/timeline.html | 2 +- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/front/src/css/timeline.css b/front/src/css/timeline.css index ab00a13..e5ba04b 100644 --- a/front/src/css/timeline.css +++ b/front/src/css/timeline.css @@ -306,3 +306,9 @@ color: #e74c3c; cursor: pointer; } +.warningsFilterOn > div { + display: none; +} +.warningsFilterOn > div.warning { + display: table-row; +} diff --git a/front/src/js/directives/offendersDirectives.js b/front/src/js/directives/offendersDirectives.js index 2407a6b..45b8b33 100644 --- a/front/src/js/directives/offendersDirectives.js +++ b/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: '
', + template: '
', 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'); diff --git a/front/src/less/timeline.less b/front/src/less/timeline.less index 7e353f8..952c918 100644 --- a/front/src/less/timeline.less +++ b/front/src/less/timeline.less @@ -345,4 +345,12 @@ .execution .icon-warning { color: #e74c3c; cursor: pointer; +} +.warningsFilterOn { + > div { + display: none; + &.warning { + display: table-row; + } + } } \ No newline at end of file diff --git a/front/src/views/timeline.html b/front/src/views/timeline.html index 176653a..dc0398c 100644 --- a/front/src/views/timeline.html +++ b/front/src/views/timeline.html @@ -64,7 +64,7 @@ -
+
Type
From 7a1bc282e91f02b2dc9ede233c33c87956bf7409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20M=C3=A9tais?= Date: Wed, 18 Mar 2015 08:16:48 +0100 Subject: [PATCH 4/4] v1.3.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aab9640..b24ecae 100644 --- a/package.json +++ b/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",