Commit 76c4bfe2 by Torkel Ödegaard

ux: new metric segment is starting to work

parent 5f3b5fdc
......@@ -20,7 +20,9 @@ export class FormDropdownCtrl {
text: any;
options: any;
cssClass: any;
cssClasses: any;
allowCustom: any;
labelMode: boolean;
linkMode: boolean;
cancelBlur: any;
onChange: any;
......@@ -33,15 +35,15 @@ export class FormDropdownCtrl {
this.linkMode = true;
this.cancelBlur = null;
if (!this.getOptions) {
this.getOptions = () => {
return Promise.resolve(this.options);
};
}
// listen to model changes
$scope.$watch("ctrl.model", this.modelChanged.bind(this));
if (this.labelMode) {
this.cssClasses = 'gf-form-label ' + this.cssClass;
} else {
this.cssClasses = 'gf-form-input gf-form-input--dropdown ' + this.cssClass;
}
this.inputElement.attr('data-provide', 'typeahead');
this.inputElement.typeahead({
source: this.typeaheadSource.bind(this),
......@@ -199,9 +201,7 @@ const template = `
spellcheck="false"
style="display:none">
</input>
<a class="gf-form-label"
ng-class="ctrl.cssClass"
<a ng-class="ctrl.cssClasses"
tabindex="1"
ng-click="ctrl.open()"
give-focus="ctrl.focus"
......@@ -218,12 +218,11 @@ export function formDropdownDirective() {
controllerAs: 'ctrl',
scope: {
model: "=",
options: "=",
getOptions: "&",
onChange: "&",
cssClass: "@",
allowCustom: "@",
selectMode: "@",
labelMode: "@",
},
link: function() {
}
......
......@@ -36,8 +36,7 @@
<label class="gf-form-label">Panel Data Source</label>
<gf-form-dropdown model="ctrl.panelDsValue"
get-options="ctrl.getOptions(true)"
on-change="ctrl.datasourceChanged($option)"
css-class="width-10">
on-change="ctrl.datasourceChanged($option)">
</gf-form-dropdown>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment