IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'grafana/master'

Browse Source
This commit is contained in:
Sébastien Bouchex Bellomié 2015-06-26 20:21:32 +02:00
commit 05fc34533f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/components/extend-jquery.js
View File

@ -24,14 +24,14 @@ function ($, angular, _) {
$tooltip.appendTo(document.body); $tooltip.appendTo(document.body);
if (opts.compile) { 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); var tmpScope = $rootScope.$new(true);
_.extend(tmpScope, opts.scopeData); _.extend(tmpScope, opts.scopeData);
$compile($tooltip)(tmpScope); $compile($tooltip)(tmpScope);
tmpScope.$digest(); tmpScope.$digest();
//tmpScope.$destroy(); tmpScope.$destroy();
}); }]);
} }
width = $tooltip.outerWidth(true); width = $tooltip.outerWidth(true);

4
public/app/features/dashboard/playlistCtrl.js
View File

@ -25,14 +25,14 @@ function (angular, _, config) {
} }
backendSrv.search(query).then(function(results) { backendSrv.search(query).then(function(results) {
$scope.searchHits = results.dashboards; $scope.searchHits = results;
$scope.filterHits(); $scope.filterHits();
}); });
}; };
$scope.filterHits = function() { $scope.filterHits = function() {
$scope.filteredHits = _.reject($scope.searchHits, function(dash) { $scope.filteredHits = _.reject($scope.searchHits, function(dash) {
return _.findWhere($scope.playlist, {slug: dash.slug}); return _.findWhere($scope.playlist, {uri: dash.uri});
}); });
}; };

2
public/app/features/dashboard/playlistSrv.js
View File

@ -18,7 +18,7 @@ function (angular, _, kbn) {
angular.element(window).unbind('resize'); angular.element(window).unbind('resize');
var dash = self.dashboards[self.index % self.dashboards.length]; var dash = self.dashboards[self.index % self.dashboards.length];
$location.url('dashboard/db/' + dash.slug); $location.url('dashboard/' + dash.uri);
self.index++; self.index++;
self.cancelPromise = $timeout(self.next, self.interval); self.cancelPromise = $timeout(self.next, self.interval);