adding lessThan directive, modified greaterThan directive, etc

This commit is contained in:
Shelby Sturgis 2015-05-07 14:54:07 -04:00
parent 763e30d7f5
commit 652eb42b4f
4 changed files with 30 additions and 4 deletions

View file

@ -5,13 +5,13 @@ define(function (require) {
return {
require: 'ngModel',
link: function ($scope, $el, $attr, ngModel) {
var val = $attr.greaterThan || 0;
ngModel.$parsers.push(validator);
ngModel.$formatters.push(validator);
function validator(value) {
var val = +$attr.greaterThan || 0;
var valid = false;
if (!isNaN(value)) valid = value > val;
if (!isNaN(value)) valid = +value > val;
ngModel.$setValidity('greaterThan', valid);
return value;
}

View file

@ -0,0 +1,21 @@
define(function (require) {
require('modules')
.get('kibana')
.directive('lessThan', function () {
return {
require: 'ngModel',
link: function ($scope, $el, $attr, ngModel) {
ngModel.$parsers.push(validator);
ngModel.$formatters.push(validator);
function validator(value) {
var val = +$attr.lessThan || 0;
var valid = false;
if (!isNaN(value)) valid = +value < val;
ngModel.$setValidity('lessThan', valid);
return value;
}
}
};
});
});

View file

@ -17,17 +17,20 @@
class="form-control"
type="number"
step="0.1"
min="{{vis.params.yAxis.min}}"
greater-than="{{vis.params.yAxis.min}}"
ng-model="vis.params.yAxis.max"
ng-required="vis.params.setYExtents">
</label>
<div ng-if="vis.params.yAxis.min > vis.params.yAxis.max">
<span class="text-danger">Min must not exceed max</span>
</div>
<label>
y-min
<input name="yMin"
class="form-control"
type="number"
step="0.1"
max="{{vis.params.yAxis.max}}"
less-than="{{vis.params.yAxis.max}}"
ng-model="vis.params.yAxis.min"
ng-required="vis.params.setYExtents">
</label>

View file

@ -2,6 +2,8 @@ define(function (require) {
var _ = require('lodash');
var $ = require('jquery');
var module = require('modules').get('kibana');
require('directives/greater_than');
require('directives/less_than');
module.directive('pointSeriesOptions', function ($parse, $compile) {
return {