Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit edd3682

Browse files
author
Simon Tsvilik
committed
Merge branch 'master' of github.com:stsvilik/angular.js
2 parents 79a88ec + 7bb5a0f commit edd3682

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/Angular.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,9 @@ function extend(dst) {
238238
forEach(arguments, function(obj){
239239
if (obj !== dst) {
240240
forEach(obj, function(value, key){
241-
dst[key] = value;
241+
if(value !== undefined) {
242+
dst[key] = value;
243+
}
242244
});
243245
}
244246
});

src/ng/directive/input.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ var inputType = {
377377
*/
378378
'checkbox': checkboxInputType,
379379

380-
'hidden': noop,
380+
'hidden': textInputType,
381381
'button': noop,
382382
'submit': noop,
383383
'reset': noop

src/ngScenario/SpecRunner.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ angular.scenario.SpecRunner.prototype.addFutureAction = function(name, behavior,
117117
angular.forEach(args, function(value, index) {
118118
selector = selector.replace('$' + (index + 1), value);
119119
});
120-
var result = $document.find(selector);
120+
var result = angular.element(selector);
121121
if (selector.match(NG)) {
122122
angular.forEach(['[ng-','[data-ng-','[x-ng-'], function(value, index){
123123
result = result.add(selector.replace(NG, value), $document);

0 commit comments

Comments
 (0)