Renamed variable value select to select dropdown

This commit is contained in:
Torkel Ödegaard 2015-06-09 09:45:24 +02:00
parent bb2d810709
commit c20fa85b82
4 changed files with 4 additions and 4 deletions

View File

@ -11,7 +11,7 @@ define([
'./spectrumPicker', './spectrumPicker',
'./tags', './tags',
'./bodyClass', './bodyClass',
'./variableValueSelect', './selectDropDown',
'./metric.segment', './metric.segment',
'./grafanaVersionCheck', './grafanaVersionCheck',
'./dropdown.typeahead', './dropdown.typeahead',

View File

@ -225,11 +225,11 @@ function (angular, app, _) {
angular angular
.module('grafana.directives') .module('grafana.directives')
.directive('variableValueSelect', function($compile, $window, $timeout) { .directive('selectDropdown', function($compile, $window, $timeout) {
return { return {
scope: { variable: "=", onUpdated: "&", getValuesForTag: "&" }, scope: { variable: "=", onUpdated: "&", getValuesForTag: "&" },
templateUrl: 'app/features/dashboard/partials/variableValueSelect.html', templateUrl: 'app/partials/selectDropdown.html',
controller: 'SelectDropdownCtrl', controller: 'SelectDropdownCtrl',
controllerAs: 'vm', controllerAs: 'vm',
bindToController: true, bindToController: true,

View File

@ -6,7 +6,7 @@
<span class="template-variable tight-form-item" ng-show="!variable.hideLabel" style="padding-right: 5px"> <span class="template-variable tight-form-item" ng-show="!variable.hideLabel" style="padding-right: 5px">
{{variable.label || variable.name}}: {{variable.label || variable.name}}:
</span> </span>
<variable-value-select variable="variable" on-updated="variableUpdated(variable)" get-values-for-tag="getValuesForTag(variable, tagKey)"></variable-value-select> <select-dropdown variable="variable" on-updated="variableUpdated(variable)" get-values-for-tag="getValuesForTag(variable, tagKey)"></select-dropdown>
</li> </li>
</ul> </ul>