Bug 1057303 - Modified default behavior to not filter results when th…

…e buildername href is middle/right/clicked
mozilla · Sep 4, 2014 · 5cbcbed · 5cbcbed
1 parent aebb7bd
commit 5cbcbed
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 9 deletions.
diff --git a/webapp/app/js/directives/main.js b/webapp/app/js/directives/main.js
@@ -64,6 +64,32 @@ treeherder.directive('preventDefaultOnLeftClick', [
         }
     }
 ]);
+treeherder.directive('thFilterByBuildername', [
+    'thJobFilters',
+    function(thJobFilters){
+        return {
+            restrict: 'A',
+            link: function(scope, element, attrs){
+                element.on('click', function(event){
+
+                    // Only execute the in page search if the
+                    // user does a left click
+                    if(event.which === 1){
+
+                        thJobFilters.setSearchQuery(scope.buildbotJobname || "");
+
+                        // Need to tell angular to run the digest cycle
+                        // to process the new values in
+                        // thJobFilters.searchQuery
+                        if(!scope.$$phase){
+                            scope.$apply();
+                        }
+                    }
+                });
+            }
+        }
+    }
+]);
 
 treeherder.directive('thNotificationBox', [
     'thNotify',

diff --git a/webapp/app/js/services/jobfilters.js b/webapp/app/js/services/jobfilters.js
@@ -683,6 +683,7 @@ treeherder.factory('thJobFilters', [
     };
 
     var setSearchQuery = function(queryStr){
+
         if(typeof queryStr === "string"){
             searchQueryStr = queryStr;
 
@@ -691,6 +692,7 @@ treeherder.factory('thJobFilters', [
             }else{
                 searchQuery = queryStr.replace(/ +(?= )/g, ' ').toLowerCase().split(' ');
             }
+
         }
     };
 
@@ -722,14 +724,18 @@ treeherder.factory('thJobFilters', [
         toggleInProgress: toggleInProgress,
         toggleSkipExclusionProfiles: toggleSkipExclusionProfiles,
 
+        getSearchQuery: getSearchQuery,
+        setSearchQuery: setSearchQuery,
+
         // CONSTANTS
         isClassified: "isClassified",
         resultStatus: "resultStatus",
         matchType: matchType,
         fieldChoices: fieldChoices,
 
-        getSearchQuery: getSearchQuery,
-        setSearchQuery: setSearchQuery
+        searchQuery: searchQuery,
+        searchQueryStr: searchQueryStr
+
     };
 
     return api;

diff --git a/webapp/app/plugins/controller.js b/webapp/app/plugins/controller.js
@@ -2,13 +2,13 @@
 
 treeherder.controller('PluginCtrl', [
     '$scope', '$rootScope', '$location', 'thUrl', 'ThJobClassificationModel',
-    'thClassificationTypes', 'ThJobModel', 'thJobFilters', 'thEvents', 'dateFilter',
+    'thClassificationTypes', 'ThJobModel', 'thEvents', 'dateFilter',
     'numberFilter', 'ThBugJobMapModel', 'thResultStatus', 'thSocket',
     'ThResultSetModel', 'ThLog', '$q', 'thPinboard', 'ThJobArtifactModel',
     'thBuildApi', 'thNotify', 'ThJobLogUrlModel',
     function PluginCtrl(
         $scope, $rootScope, $location, thUrl, ThJobClassificationModel,
-        thClassificationTypes, ThJobModel, thJobFilters, thEvents, dateFilter,
+        thClassificationTypes, ThJobModel, thEvents, dateFilter,
         numberFilter, ThBugJobMapModel, thResultStatus, thSocket,
         ThResultSetModel, ThLog, $q, thPinboard, ThJobArtifactModel,
         thBuildApi, thNotify, ThJobLogUrlModel) {
@@ -249,10 +249,6 @@ treeherder.controller('PluginCtrl', [
             }
         };
 
-        $scope.filterByBuildername = function(buildername){
-            thJobFilters.setSearchQuery(buildername);
-        };
-
         $scope.pinboard_service = thPinboard;
 
         var updateClassification = function(classification){

diff --git a/webapp/app/plugins/pluginpanel.html b/webapp/app/plugins/pluginpanel.html
@@ -96,7 +96,7 @@
         </li>
       </ul>
       <ul>
-        <li><h6><a href="{{ buildbotJobnameHref }}" ng-click="filterByBuildername(buildbotJobname);" target="_blank" prevent-default-on-left-click>{{ buildbotJobname }}</a></h6></li>
+        <li><h6><a href="{{ buildbotJobnameHref }}" target="_blank" prevent-default-on-left-click th-filter-by-buildername>{{ buildbotJobname }}</a></h6></li>
         <li class="small">
           <label>Machine name:</label>
           <a title="Open Buildbot Slave Health Report" target="_blank"