opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 18:44:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed .jshintrc statement, implemented manage dashboard tooltip.

Browse Source
This commit is contained in:
ubhatnagar
2015-09-21 08:09:34 +05:30
parent 923df8244b
commit 00c89b8354
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.jshintrc
View File

@ -30,7 +30,6 @@
"define": true,
"require": true,
"Chromath": false,
"setImmediate": true,
"$": false
"setImmediate": true
}
}

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

@ -52,7 +52,7 @@ function (angular, _) {
};
$scope.manageButtonClickAction = function() {
$('.tooltip').not(this).hide();
angular.element('#manageDashboardButton').tooltip('hide');
$scope.appEvent('hide-dash-search');
};

2
public/app/features/dashboard/partials/dashboardTopNav.html
View File

@ -30,7 +30,7 @@
<a ng-click="saveDashboard()" bs-tooltip="'Save dashboard'" data-placement="bottom"><i class="fa fa-save"></i></a>
</li>
<li class="dropdown">
<a class="pointer" ng-click="manageButtonClickAction()" bs-tooltip="'Manage dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
<a id="manageDashboardButton" class="pointer" ng-click="manageButtonClickAction()" bs-tooltip="'Manage dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
<ul class="dropdown-menu">
<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('settings');">Settings</a></li>
<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('annotations');">Annotations</a></li>