Browse Source

Remove jQuery from timeline when it's filtered

Gaël Métais 10 years ago
parent
commit
62602a88bc
1 changed files with 7 additions and 3 deletions
  1. 7 3
      front/src/js/controllers/timelineCtrl.js

+ 7 - 3
front/src/js/controllers/timelineCtrl.js

@@ -57,9 +57,13 @@ timelineCtrl.controller('TimelineCtrl', ['$scope', '$rootScope', '$routeParams',
         originalExecutions.forEach(function(node) {
         originalExecutions.forEach(function(node) {
             
             
             // Filter by script (if enabled)
             // Filter by script (if enabled)
-            if ($scope.selectedScript && node.data.backtrace &&
-                    node.data.backtrace.indexOf($scope.selectedScript.fullPath + ':') === -1) {
-                return;
+            if ($scope.selectedScript) {
+                if (node.data.backtrace && node.data.backtrace.indexOf($scope.selectedScript.fullPath + ':') === -1) {
+                    return;
+                }
+                if (node.data.type === "jQuery loaded" || node.data.type === "jQuery version change") {
+                    return;
+                }
             }
             }
 
 
             // Prepare a faster angular search by creating a kind of search index
             // Prepare a faster angular search by creating a kind of search index