Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-05 21:54:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

checkbox widget fix

Browse source
This commit is contained in:
Misko Hevery 2010-04-13 14:25:12 -07:00
parent e8ac57caae
commit cd03fe92a5
4 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
angular-debug.js vendored
View file

@ -3185,13 +3185,13 @@ function valueAccessor(scope, element) {
} }
function checkedAccessor(scope, element) { function checkedAccessor(scope, element) {
var domElement = element[0]; var domElement = element[0], elementValue = domElement.value;
return { return {
get: function(){ get: function(){
return !!domElement.checked; return !!domElement.checked;
}, },
set: function(value){ set: function(value){
domElement.checked = !!value; domElement.checked = toBoolean(value);
} }
}; };
} }
@ -3444,8 +3444,13 @@ angularService("$location", function(browser){
scope.$root.$eval(); scope.$root.$eval();
}); });
parse(browser.getUrl()); parse(browser.getUrl());
var lastURL;
this.$onEval(PRIORITY_LAST, function(){ this.$onEval(PRIORITY_LAST, function(){
browser.setUrl(toString()); var url = toString();
if (lastURL != url) {
browser.setUrl(url);
lastURL = url;
}
}); });
return location; return location;
}, {inject: ['$browser']}); }, {inject: ['$browser']});

7
src/services.js
View file

@ -44,8 +44,13 @@ angularService("$location", function(browser){
scope.$root.$eval(); scope.$root.$eval();
}); });
parse(browser.getUrl()); parse(browser.getUrl());
var lastURL;
this.$onEval(PRIORITY_LAST, function(){ this.$onEval(PRIORITY_LAST, function(){
browser.setUrl(toString()); var url = toString();
if (lastURL != url) {
browser.setUrl(url);
lastURL = url;
}
}); });
return location; return location;
}, {inject: ['$browser']}); }, {inject: ['$browser']});

4
src/widgets.js
View file

@ -49,13 +49,13 @@ function valueAccessor(scope, element) {
} }
function checkedAccessor(scope, element) { function checkedAccessor(scope, element) {
var domElement = element[0]; var domElement = element[0], elementValue = domElement.value;
return { return {
get: function(){ get: function(){
return !!domElement.checked; return !!domElement.checked;
}, },
set: function(value){ set: function(value){
domElement.checked = !!value; domElement.checked = toBoolean(value);
} }
}; };
} }

11
test/widgetsSpec.js
View file

@ -6,9 +6,10 @@ describe("input widget", function(){
scope = null; scope = null;
element = null; element = null;
var compiler = new Compiler(angularTextMarkup, angularAttrMarkup, angularDirective, angularWidget); var compiler = new Compiler(angularTextMarkup, angularAttrMarkup, angularDirective, angularWidget);
compile = function(html) { compile = function(html, before) {
element = jqLite(html); element = jqLite(html);
scope = compiler.compile(element)(element); scope = compiler.compile(element)(element);
(before||noop)();
scope.$init(); scope.$init();
}; };
}); });
@ -51,6 +52,14 @@ describe("input widget", function(){
expect(scope.$get('list')).toEqual(['1', '2', '3']); expect(scope.$get('list')).toEqual(['1', '2', '3']);
}); });
it("should process ng-format for booleans", function(){
compile('<input type="checkbox" name="name" value="true" ng-format="boolean"/>', function(){
scope.name = false;
});
expect(scope.name).toEqual(false);
expect(scope.$element[0].checked).toEqual(false);
});
it("should process ng-validation", function(){ it("should process ng-validation", function(){
compile('<input type="text" name="price" value="abc" ng-validate="number"/>'); compile('<input type="text" name="price" value="abc" ng-validate="number"/>');
expect(element.hasClass('ng-validation-error')).toBeTruthy(); expect(element.hasClass('ng-validation-error')).toBeTruthy();