Skip to content

Commit

Permalink
Add step option for integer inputs in StyleManager
Browse files Browse the repository at this point in the history
  • Loading branch information
artf committed Sep 19, 2017
1 parent bbbcb6c commit 8903557
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 14 deletions.
55 changes: 41 additions & 14 deletions src/domain_abstract/ui/InputNumber.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,21 +135,26 @@ module.exports = Backbone.View.extend({
* Invoked when the up arrow is clicked
* */
upArrowClick() {
var value = this.model.get('value');
value = isNaN(value) ? 1 : parseInt(value, 10) + 1;
const model = this.model;
const step = model.get('step');
let value = model.get('value');
//value = isNaN(value) ? 1 * step : parseFloat(value);
value = this.normalizeValue(value + step);
var valid = this.validateInputValue(value);
this.model.set('value', valid.value);
model.set('value', valid.value);
this.elementUpdated();
},

/**
* Invoked when the down arrow is clicked
* */
downArrowClick() {
var value = this.model.get('value');
value = isNaN(value) ? 0 : parseInt(value, 10) - 1;
const model = this.model;
const step = model.get('step');
let value = model.get('value');
value = this.normalizeValue(value - step);
var valid = this.validateInputValue(value);
this.model.set('value', valid.value);
model.set('value', valid.value);
this.elementUpdated();
},

Expand All @@ -163,8 +168,8 @@ module.exports = Backbone.View.extend({
e.preventDefault();
this.moved = 0;
var value = this.model.get('value');
value = isNaN(value) ? 0 : parseInt(value, 10);
var current = {y: e.pageY, val: value };
value = this.normalizeValue(value);
var current = {y: e.pageY, val: value};
this.docEl.mouseup(current, this.upIncrement);
this.docEl.mousemove(current, this.moveIncrement);
},
Expand All @@ -176,9 +181,11 @@ module.exports = Backbone.View.extend({
* */
moveIncrement(ev) {
this.moved = 1;
var pos = parseInt(ev.data.val - ev.pageY + ev.data.y, 10);
this.prValue = this.validateInputValue(pos).value;//Math.max(this.min, Math.min(this.max, pos) );
this.model.set('value', this.prValue, {avoidStore: 1});
const model = this.model;
const step = model.get('step');
var pos = this.normalizeValue(ev.data.val + (ev.data.y - ev.pageY) * step);
this.prValue = this.validateInputValue(pos).value;
model.set('value', this.prValue, {avoidStore: 1});
return false;
},

Expand All @@ -189,17 +196,37 @@ module.exports = Backbone.View.extend({
* @return void
* */
upIncrement(e) {
const model = this.model;
const step = model.get('step');
this.docEl.off('mouseup', this.upIncrement);
this.docEl.off('mousemove', this.moveIncrement);

if(this.prValue && this.moved) {
var value = this.prValue - 1;
this.model.set('value', value, {avoidStore: 1})
.set('value', value + 1);
var value = this.prValue - step;
model.set('value', value, {avoidStore: 1})
.set('value', value + step);
this.elementUpdated();
}
},

normalizeValue(value, defValue = 0) {
const model = this.model;
const step = model.get('step');
let stepDecimals = 0;

if (isNaN(value)) {
return defValue;
}

value = parseFloat(value);

if (Math.floor(value) !== value) {
stepDecimals = step.toString().split('.')[1].length || 0;
}

return stepDecimals ? parseFloat(value.toFixed(stepDecimals)) : value;
},

/**
* Validate input value
* @param {String} value Raw value
Expand Down
9 changes: 9 additions & 0 deletions src/style_manager/model/PropertyInteger.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ module.exports = Property.extend({

// Selected unit, eg. 'px'
unit: '',

// Integer value steps
step: 1,

// Minimum value
min: '',

// Maximum value
max: '',
}),

getFullValue() {
Expand Down

0 comments on commit 8903557

Please sign in to comment.