From 693af182c7761678ba3be5aab8c8c8f6b5f5524d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 26 Jun 2015 19:11:52 +0200
Subject: [PATCH 1/2] Fixed broken playlist in master, Fixes #2240

---
 public/app/features/dashboard/playlistCtrl.js | 4 ++--
 public/app/features/dashboard/playlistSrv.js  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/app/features/dashboard/playlistCtrl.js b/public/app/features/dashboard/playlistCtrl.js
index 5320a0b808e..b5d04374e9a 100644
--- a/public/app/features/dashboard/playlistCtrl.js
+++ b/public/app/features/dashboard/playlistCtrl.js
@@ -25,14 +25,14 @@ function (angular, _, config) {
       }
 
       backendSrv.search(query).then(function(results) {
-        $scope.searchHits = results.dashboards;
+        $scope.searchHits = results;
         $scope.filterHits();
       });
     };
 
     $scope.filterHits = function() {
       $scope.filteredHits = _.reject($scope.searchHits, function(dash) {
-        return _.findWhere($scope.playlist, {slug: dash.slug});
+        return _.findWhere($scope.playlist, {uri: dash.uri});
       });
     };
 
diff --git a/public/app/features/dashboard/playlistSrv.js b/public/app/features/dashboard/playlistSrv.js
index 0711cb7c453..9997581fbc3 100644
--- a/public/app/features/dashboard/playlistSrv.js
+++ b/public/app/features/dashboard/playlistSrv.js
@@ -18,7 +18,7 @@ function (angular, _, kbn) {
       angular.element(window).unbind('resize');
       var dash = self.dashboards[self.index % self.dashboards.length];
 
-      $location.url('dashboard/db/' + dash.slug);
+      $location.url('dashboard/' + dash.uri);
 
       self.index++;
       self.cancelPromise = $timeout(self.next, self.interval);

From 20d5d0eee6e926779fa5f011e8a9b7acd13278cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 26 Jun 2015 19:42:33 +0200
Subject: [PATCH 2/2] Fixed issue with annotations that only occurs in
 optimized build, Fixes #2176, Fixes #2239

---
 public/app/components/extend-jquery.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/app/components/extend-jquery.js b/public/app/components/extend-jquery.js
index 3e1f6b0c054..f44245103b5 100644
--- a/public/app/components/extend-jquery.js
+++ b/public/app/components/extend-jquery.js
@@ -24,14 +24,14 @@ function ($, angular, _) {
         $tooltip.appendTo(document.body);
 
         if (opts.compile) {
-          angular.element(document).injector().invoke(function($compile, $rootScope) {
+          angular.element(document).injector().invoke(["$compile", "$rootScope", function($compile, $rootScope) {
             var tmpScope = $rootScope.$new(true);
             _.extend(tmpScope, opts.scopeData);
 
             $compile($tooltip)(tmpScope);
             tmpScope.$digest();
-            //tmpScope.$destroy();
-          });
+            tmpScope.$destroy();
+          }]);
         }
 
         width = $tooltip.outerWidth(true);