Skip to content

Commit 51f0019

Browse files
hueitanhueitan
committed
provider validate reset doesn't need parameter scope anymore
provider $rootScope fix it
1 parent 34b8023 commit 51f0019

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Add Valid Callback Function, `invalid-callback` & `valid-callback`
7575
```
7676

7777
Select the validation method `watch` `blur` `submit`, default as `watch`<br/>
78-
`validationProvider.validate($scope, form).success(callback).error(callback)` use callback to continue your submit
78+
`validationProvider.validate(form).success(callback).error(callback)` use callback to continue your submit
7979

8080
```html
8181
<label>Watch method</label>
@@ -94,7 +94,7 @@ Select the validation method `watch` `blur` `submit`, default as `watch`<br/>
9494
// ... validate method, it will check `checkValid(Form)`
9595
$scope.form = {
9696
submit: function () {
97-
$validationProvider.validate($scope, form)
97+
$validationProvider.validate(form)
9898
.success(successCallback)
9999
.error(errorCallback);
100100
}
@@ -187,7 +187,7 @@ Reset the specific Form. `reset()`
187187
$scope.form.checkValid = validationProvider.checkValid;
188188
// ... reset
189189
$scope.form.reset = function (form) {
190-
validationProvider.reset($scope, form);
190+
validationProvider.reset(form);
191191
};
192192
```
193193

‎demo/demo.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,32 @@ angular.module('myApp', ['validation'])
1313
requiredCallback: 'required',
1414
checkValid: $validationProvider.checkValid,
1515
submit: function (form) {
16-
$validationProvider.validate($scope, form);
16+
$validationProvider.validate(form);
1717
},
1818
reset: function (form) {
19-
$validationProvider.reset($scope, form);
19+
$validationProvider.reset(form);
2020
}
2121
};
2222

2323
$scope.form2 = {
2424
checkValid: $validationProvider.checkValid,
2525
submit: function (form) {
26-
$validationProvider.validate($scope, form);
26+
$validationProvider.validate(form);
2727
},
2828
reset: function (form) {
29-
$validationProvider.reset($scope, form);
29+
$validationProvider.reset(form);
3030
}
3131
};
3232

3333
$scope.form3 = {
3434
checkValid: $validationProvider.checkValid,
3535
submit: function (form) {
36-
$validationProvider.validate($scope, form)
36+
$validationProvider.validate(form)
3737
.success($scope.success)
3838
.error($scope.error);
3939
},
4040
reset: function (form) {
41-
$validationProvider.reset($scope, form);
41+
$validationProvider.reset(form);
4242
}
4343
};
4444

‎dist/angular-validation.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88

99
var $injector,
10+
$scope,
1011
$http,
1112
$q,
1213
_this = this;
@@ -18,6 +19,7 @@
1819
*/
1920
var setup = function (injector) {
2021
$injector = injector;
22+
$scope = $injector.get('$rootScope');
2123
$http = $injector.get('$http');
2224
$q = $injector.get('$q');
2325
};
@@ -159,15 +161,14 @@
159161

160162
/**
161163
* Validate the form when click submit, when `validMethod = submit`
162-
* @param scope
163164
* @param form
164165
* @returns {promise|*}
165166
*/
166-
this.validate = function (scope, form) {
167+
this.validate = function (form) {
167168

168169
for (var k in form) {
169170
if (form[k].hasOwnProperty('$dirty')) {
170-
scope.$broadcast(k + 'submit');
171+
$scope.$broadcast(k + 'submit');
171172
}
172173
}
173174

@@ -199,17 +200,16 @@
199200

200201
/**
201202
* reset the specific form
202-
* @param scope
203203
* @param form
204204
*/
205-
this.reset = function (scope, form) {
205+
this.reset = function (form) {
206206
for (var k in form) {
207207
if (form[k].hasOwnProperty('$dirty')) {
208208
form[k].$setViewValue(null);
209209
form[k].$setPristine();
210210
form[k].$setValidity(form[k].$name, false);
211211
form[k].$render();
212-
scope.$broadcast(k + 'reset');
212+
$scope.$broadcast(k + 'reset');
213213
}
214214
}
215215
};

‎dist/angular-validation.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/provider.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55

66
var $injector,
7+
$scope,
78
$http,
89
$q,
910
_this = this;
@@ -15,6 +16,7 @@
1516
*/
1617
var setup = function (injector) {
1718
$injector = injector;
19+
$scope = $injector.get('$rootScope');
1820
$http = $injector.get('$http');
1921
$q = $injector.get('$q');
2022
};
@@ -156,15 +158,14 @@
156158

157159
/**
158160
* Validate the form when click submit, when `validMethod = submit`
159-
* @param scope
160161
* @param form
161162
* @returns {promise|*}
162163
*/
163-
this.validate = function (scope, form) {
164+
this.validate = function (form) {
164165

165166
for (var k in form) {
166167
if (form[k].hasOwnProperty('$dirty')) {
167-
scope.$broadcast(k + 'submit');
168+
$scope.$broadcast(k + 'submit');
168169
}
169170
}
170171

@@ -196,17 +197,16 @@
196197

197198
/**
198199
* reset the specific form
199-
* @param scope
200200
* @param form
201201
*/
202-
this.reset = function (scope, form) {
202+
this.reset = function (form) {
203203
for (var k in form) {
204204
if (form[k].hasOwnProperty('$dirty')) {
205205
form[k].$setViewValue(null);
206206
form[k].$setPristine();
207207
form[k].$setValidity(form[k].$name, false);
208208
form[k].$render();
209-
scope.$broadcast(k + 'reset');
209+
$scope.$broadcast(k + 'reset');
210210
}
211211
}
212212
};

‎test/unit/providerSpec.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ describe('provider', function () {
110110
$scope.$on('requiredreset', function () {
111111
resetSpy();
112112
});
113-
validationProvider.reset($scope, $scope.Form);
113+
validationProvider.reset($scope.Form);
114114
expect(element.find('p')[0]).toBeUndefined();
115115
expect(resetSpy).toHaveBeenCalled();
116116
}));
@@ -130,7 +130,7 @@ describe('provider', function () {
130130
$scope.$apply(function () {
131131
$scope.required = 'Required';
132132
});
133-
validationProvider.validate($scope, $scope.Form)
133+
validationProvider.validate($scope.Form)
134134
.success(function () {
135135
successSpy();
136136
})
@@ -152,7 +152,7 @@ describe('provider', function () {
152152
submitSpy2();
153153
});
154154

155-
validationProvider.validate($scope, $scope.Form)
155+
validationProvider.validate($scope.Form)
156156
.success(function () {
157157
successSpy2();
158158
})

0 commit comments

Comments
 (0)