Skip to content

Commit 1a941e6

Browse files
committed
Merge pull request hojberg#15 from rafBM/master
Prevent negative values for Size and Border width
2 parents 32487a7 + a76930c commit 1a941e6

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

public/js/lib/views/arrow_configuration_view.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,13 @@ if (!('CSSArrowPlease' in window)) window.CSSArrowPlease = {};
9797
var target = $(ev.currentTarget),
9898
val = parseInt(target.val()),
9999
increment = ev.keyCode == 38 ? 1 : -1,
100-
multiply = ev.shiftKey ? 10 : 1
100+
multiply = ev.shiftKey ? 10 : 1,
101+
newVal = val + increment * multiply;
101102

102-
target.val(val + increment * multiply);
103-
this._updateModel(ev)
103+
if (newVal < 0) newVal = 0;
104+
105+
target.val(newVal);
106+
this._updateModel(ev);
104107
}
105108

106109
};

public/js/spec/views/arrow_configuration_view_spec.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,15 @@ describe("CSSArrowPlease.ArrowConfigurationView", function () {
8787
arrowAttr = object.arrowAttr;
8888

8989
$.each(keystrokes, function (i, keystroke) {
90-
var keydown = $.Event('keydown')
90+
var keydown = $.Event('keydown'),
91+
expectedVal = defaultVal + keystroke.increment;
9192
keydown.keyCode = keystroke.key;
9293
keydown.shiftKey = keystroke.shift;
9394

9495
elem.val(defaultVal).trigger(keydown);
95-
expect( arrow.get(arrowAttr) ).toEqual(defaultVal + keystroke.increment);
96+
97+
if (expectedVal < 0) expectedVal = 0;
98+
expect( arrow.get(arrowAttr) ).toEqual(expectedVal);
9699
});
97100
});
98101
});

0 commit comments

Comments
 (0)