Skip to content

Commit d83a92c

Browse files
committed
fix(checkbox): prefix true-value & false-value with ng:
1 parent d0425de commit d83a92c

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/widget/input.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,8 @@ angularInputType('integer', numericRegexpInputType(INTEGER_REGEXP, 'INTEGER'));
414414
*
415415
* @param {string} ng:model Assignable angular expression to data-bind to.
416416
* @param {string=} name Property name of the form under which the widgets is published.
417-
* @param {string=} true-value The value to which the expression should be set when selected.
418-
* @param {string=} false-value The value to which the expression should be set when not selected.
417+
* @param {string=} ng:true-value The value to which the expression should be set when selected.
418+
* @param {string=} ng:false-value The value to which the expression should be set when not selected.
419419
* @param {string=} ng:change Angular expression to be executed when input changes due to user
420420
* interaction with the input element.
421421
*
@@ -432,7 +432,7 @@ angularInputType('integer', numericRegexpInputType(INTEGER_REGEXP, 'INTEGER'));
432432
<form name="myForm">
433433
Value1: <input type="checkbox" ng:model="value1"> <br/>
434434
Value2: <input type="checkbox" ng:model="value2"
435-
true-value="YES" false-value="NO"> <br/>
435+
ng:true-value="YES" ng:false-value="NO"> <br/>
436436
</form>
437437
<tt>value1 = {{value1}}</tt><br/>
438438
<tt>value2 = {{value2}}</tt><br/>
@@ -453,8 +453,8 @@ angularInputType('integer', numericRegexpInputType(INTEGER_REGEXP, 'INTEGER'));
453453
*/
454454
angularInputType('checkbox', function(inputElement) {
455455
var widget = this,
456-
trueValue = inputElement.attr('true-value'),
457-
falseValue = inputElement.attr('false-value');
456+
trueValue = inputElement.attr('ng:true-value'),
457+
falseValue = inputElement.attr('ng:false-value');
458458

459459
if (!isString(trueValue)) trueValue = true;
460460
if (!isString(falseValue)) falseValue = false;

test/widget/inputSpec.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,13 @@ describe('widget: input', function() {
256256

257257

258258
it('should allow custom enumeration', function() {
259-
compile('<input type="checkbox" ng:model="name" true-value="ano" false-value="nie"/>');
259+
compile('<input type="checkbox" ng:model="name" ng:true-value="y" ng:false-value="n">');
260260

261-
scope.name='ano';
261+
scope.name='y';
262262
scope.$digest();
263263
expect(scope.$element[0].checked).toBe(true);
264264

265-
scope.name='nie';
265+
scope.name='n';
266266
scope.$digest();
267267
expect(scope.$element[0].checked).toBe(false);
268268

@@ -271,10 +271,10 @@ describe('widget: input', function() {
271271
expect(scope.$element[0].checked).toBe(false);
272272

273273
browserTrigger(element);
274-
expect(scope.name).toEqual('ano');
274+
expect(scope.name).toEqual('y');
275275

276276
browserTrigger(element);
277-
expect(scope.name).toEqual('nie');
277+
expect(scope.name).toEqual('n');
278278
});
279279

280280

0 commit comments

Comments
 (0)