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

refactor

Browse Source
This commit is contained in:
Mitsuhiro Tanda 2016-06-26 22:15:57 +09:00
parent 16dc095329
commit 8af3bb739c
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
public/app/features/templating/templateValuesSrv.js
View File

@ -359,29 +359,29 @@ function (angular, _, kbn) {
}
options = _.uniq(options, 'value');
var sortType = Math.ceil(variable.sort / 2);
if (sortType === 0) {
return options;
} else {
if (sortType === 1) {
options = _.sortBy(options, 'text');
} else if (sortType === 2) {
options = _.sortBy(options, function(opt) {
var matches = opt.text.match(/.*?(\d+).*/);
if (!matches) {
return 0;
} else {
return parseInt(matches[1], 10);
}
});
}
if (variable.sort % 2 === 0) {
options = options.reverse();
}
if (variable.sort === 0) {
return options;
}
var sortType = Math.ceil(variable.sort / 2);
var reverseSort = (variable.sort % 2 === 0);
if (sortType === 1) {
options = _.sortBy(options, 'text');
} else if (sortType === 2) {
options = _.sortBy(options, function(opt) {
var matches = opt.text.match(/.*?(\d+).*/);
if (!matches) {
return 0;
} else {
return parseInt(matches[1], 10);
}
});
}
if (reverseSort) {
options = options.reverse();
}
return options;
};
this.addAllOption = function(variable) {