Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit fd1a93a

Browse files
petebacondarwinpetebacondarwin
committed
refactor(ngModelOptions): internal variables do not start with a $ 
1 parent 7d24af1 commit fd1a93a

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

‎src/ng/directive/ngModel.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
PENDING_CLASS: true,
1010
addSetValidityMethod: true,
1111
setupValidity: true,
12-
$defaultModelOptions: false
12+
defaultModelOptions: false
1313
*/
1414

1515

@@ -245,7 +245,7 @@ function NgModelController($scope, $exceptionHandler, $attr, $element, $parse, $
245245
this.$pending = undefined; // keep pending keys here
246246
this.$name = $interpolate($attr.name || '', false)($scope);
247247
this.$$parentForm = nullFormCtrl;
248-
this.$options = $defaultModelOptions;
248+
this.$options = defaultModelOptions;
249249

250250
this.$$parsedNgModel = $parse($attr.ngModel);
251251
this.$$parsedNgModelAssign = this.$$parsedNgModel.assign;

‎src/ng/directive/ngModelOptions.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

3-
/* exported $defaultModelOptions */
4-
var $defaultModelOptions;
3+
/* exported defaultModelOptions */
4+
var defaultModelOptions;
55
var DEFAULT_REGEXP = /(\s+|^)default(\s+|$)/;
66

77
/**
@@ -72,14 +72,14 @@ ModelOptions.prototype = {
7272
}
7373

7474
// Finally add in any missing defaults
75-
defaults(options, $defaultModelOptions.$$options);
75+
defaults(options, defaultModelOptions.$$options);
7676

7777
return new ModelOptions(options);
7878
}
7979
};
8080

8181

82-
$defaultModelOptions = new ModelOptions({
82+
defaultModelOptions = new ModelOptions({
8383
updateOn: '',
8484
updateOnDefault: true,
8585
debounce: 0,
@@ -335,7 +335,7 @@ var ngModelOptionsDirective = function() {
335335
link: {
336336
pre: function ngModelOptionsPreLinkFn(scope, element, attrs, ctrls) {
337337
var optionsCtrl = ctrls[0];
338-
var parentOptions = ctrls[1] ? ctrls[1].$options : $defaultModelOptions;
338+
var parentOptions = ctrls[1] ? ctrls[1].$options : defaultModelOptions;
339339
optionsCtrl.$options = parentOptions.createChild(scope.$eval(attrs.ngModelOptions));
340340
}
341341
}

‎test/ng/directive/ngModelOptionsSpec.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
/* globals
44
generateInputCompilerHelper: false,
5-
$defaultModelOptions: false
5+
defaultModelOptions: false
66
*/
77
describe('ngModelOptions', function() {
88

9-
describe('$defaultModelOptions', function() {
9+
describe('defaultModelOptions', function() {
1010
it('should provide default values', function() {
11-
expect($defaultModelOptions.getOption('updateOn')).toEqual('');
12-
expect($defaultModelOptions.getOption('updateOnDefault')).toEqual(true);
13-
expect($defaultModelOptions.getOption('debounce')).toBe(0);
14-
expect($defaultModelOptions.getOption('getterSetter')).toBe(false);
15-
expect($defaultModelOptions.getOption('allowInvalid')).toBe(false);
16-
expect($defaultModelOptions.getOption('timezone')).toBe(null);
11+
expect(defaultModelOptions.getOption('updateOn')).toEqual('');
12+
expect(defaultModelOptions.getOption('updateOnDefault')).toEqual(true);
13+
expect(defaultModelOptions.getOption('debounce')).toBe(0);
14+
expect(defaultModelOptions.getOption('getterSetter')).toBe(false);
15+
expect(defaultModelOptions.getOption('allowInvalid')).toBe(false);
16+
expect(defaultModelOptions.getOption('timezone')).toBe(null);
1717
});
1818
});
1919

@@ -31,18 +31,18 @@ describe('ngModelOptions', function() {
3131
}));
3232

3333

34-
describe('should fall back to `$defaultModelOptions`', function() {
34+
describe('should fall back to `defaultModelOptions`', function() {
3535
it('if there is no `ngModelOptions` directive', function() {
3636
var inputElm = helper.compileInput(
3737
'<input type="text" ng-model="name" name="alias" />');
3838

3939
var inputOptions = $rootScope.form.alias.$options;
40-
expect(inputOptions.getOption('updateOn')).toEqual($defaultModelOptions.getOption('updateOn'));
41-
expect(inputOptions.getOption('updateOnDefault')).toEqual($defaultModelOptions.getOption('updateOnDefault'));
42-
expect(inputOptions.getOption('debounce')).toEqual($defaultModelOptions.getOption('debounce'));
43-
expect(inputOptions.getOption('getterSetter')).toEqual($defaultModelOptions.getOption('getterSetter'));
44-
expect(inputOptions.getOption('allowInvalid')).toEqual($defaultModelOptions.getOption('allowInvalid'));
45-
expect(inputOptions.getOption('timezone')).toEqual($defaultModelOptions.getOption('timezone'));
40+
expect(inputOptions.getOption('updateOn')).toEqual(defaultModelOptions.getOption('updateOn'));
41+
expect(inputOptions.getOption('updateOnDefault')).toEqual(defaultModelOptions.getOption('updateOnDefault'));
42+
expect(inputOptions.getOption('debounce')).toEqual(defaultModelOptions.getOption('debounce'));
43+
expect(inputOptions.getOption('getterSetter')).toEqual(defaultModelOptions.getOption('getterSetter'));
44+
expect(inputOptions.getOption('allowInvalid')).toEqual(defaultModelOptions.getOption('allowInvalid'));
45+
expect(inputOptions.getOption('timezone')).toEqual(defaultModelOptions.getOption('timezone'));
4646
});
4747

4848

@@ -51,9 +51,9 @@ describe('ngModelOptions', function() {
5151
'<input type="text" ng-model="name" name="alias" ng-model-options="{ updateOn: \'blur\' }"/>');
5252

5353
var inputOptions = $rootScope.form.alias.$options;
54-
expect(inputOptions.getOption('debounce')).toEqual($defaultModelOptions.getOption('debounce'));
54+
expect(inputOptions.getOption('debounce')).toEqual(defaultModelOptions.getOption('debounce'));
5555
expect(inputOptions.getOption('updateOnDefault')).toBe(false);
56-
expect(inputOptions.getOption('updateOnDefault')).not.toEqual($defaultModelOptions.getOption('updateOnDefault'));
56+
expect(inputOptions.getOption('updateOnDefault')).not.toEqual(defaultModelOptions.getOption('updateOnDefault'));
5757
});
5858

5959

@@ -63,9 +63,9 @@ describe('ngModelOptions', function() {
6363
'</form>')($rootScope);
6464
var inputOptions = $rootScope.form.alias.$options;
6565

66-
expect(inputOptions.getOption('debounce')).toEqual($defaultModelOptions.getOption('debounce'));
66+
expect(inputOptions.getOption('debounce')).toEqual(defaultModelOptions.getOption('debounce'));
6767
expect(inputOptions.getOption('updateOnDefault')).toBe(false);
68-
expect(inputOptions.getOption('updateOnDefault')).not.toEqual($defaultModelOptions.getOption('updateOnDefault'));
68+
expect(inputOptions.getOption('updateOnDefault')).not.toEqual(defaultModelOptions.getOption('updateOnDefault'));
6969
dealoc(form);
7070
});
7171
});

0 commit comments

Comments
 (0)