Skip to content

Commit f882501

Browse files
committed
Update angular version 1.2.22 => 1.2.25
1 parent bcd36eb commit f882501

4 files changed

Lines changed: 294 additions & 188 deletions

File tree

config/karma.conf.angular.1.2.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ module.exports = function(config) {
77

88
// list of files / patterns to load in the browser
99
files: [
10-
'test/lib/angular.1.2.22.js',
11-
'test/lib/angular-mocks.1.2.22.js',
10+
'test/lib/angular.1.2.25.js',
11+
'test/lib/angular-mocks.1.2.25.js',
1212
'dist/angular-validation.js',
1313
'dist/angular-validation-rule.js',
1414
'test/unit/*.js'

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ <h1>Angular Validation.
211211
</div>
212212

213213
<a href="https://github.com/huei90/angular-validation"><img src="demo/iconmonstr-github-10-icon-128.png" id="github-link" alt="Fork me on Github"/></a>
214-
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.22/angular.min.js"></script>
214+
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.25/angular.min.js"></script>
215215
<script src="dist/angular-validation.js"></script>
216216
<script src="dist/angular-validation-rule.js"></script>
217217
<script src="demo/demo.js"></script>
Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.2.22
2+
* @license AngularJS v1.2.25
33
* (c) 2010-2014 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -63,6 +63,8 @@
6363
return listener;
6464
};
6565

66+
self.$$checkUrlChange = angular.noop;
67+
6668
self.cookieHash = {};
6769
self.lastCookieHash = {};
6870
self.deferredFns = [];
@@ -888,7 +890,7 @@
888890
* development please see {@link ngMockE2E.$httpBackend e2e $httpBackend mock}.
889891
*
890892
* During unit testing, we want our unit tests to run quickly and have no external dependencies so
891-
* we don’t want to send [XHR](https://developer.mozilla.org/en/xmlhttprequest) or
893+
* we don’t want to send [XHR](https://developer.mozilla.org/en/xmlhttprequest) or
892894
* [JSONP](http://en.wikipedia.org/wiki/JSONP) requests to a real server. All we really need is
893895
* to verify whether a certain request has been sent or not, or alternatively just let the
894896
* application make requests, respond with pre-trained responses and assert that the end result is
@@ -1043,7 +1045,7 @@
10431045
var controller = createController();
10441046
$httpBackend.flush();
10451047
1046-
// now you don’t care about the authentication, but
1048+
// now you don’t care about the authentication, but
10471049
// the controller will still send the request and
10481050
// $httpBackend will respond without you having to
10491051
// specify the expectation and response for this request
@@ -1194,10 +1196,10 @@
11941196
* @returns {requestHandler} Returns an object with `respond` method that controls how a matched
11951197
* request is handled.
11961198
*
1197-
* - respond
1199+
* - respond –
11981200
* `{function([status,] data[, headers, statusText])
11991201
* | function(function(method, url, data, headers)}`
1200-
* The respond method takes a set of static data to be returned or a function that can
1202+
* – The respond method takes a set of static data to be returned or a function that can
12011203
* return an array containing response status (number), response data (string), response
12021204
* headers (Object), and the text for the status (string).
12031205
*/
@@ -1312,10 +1314,10 @@
13121314
* @returns {requestHandler} Returns an object with `respond` method that control how a matched
13131315
* request is handled.
13141316
*
1315-
* - respond
1317+
* - respond –
13161318
* `{function([status,] data[, headers, statusText])
13171319
* | function(function(method, url, data, headers)}`
1318-
* The respond method takes a set of static data to be returned or a function that can
1320+
* – The respond method takes a set of static data to be returned or a function that can
13191321
* return an array containing response status (number), response data (string), response
13201322
* headers (Object), and the text for the status (string).
13211323
*/
@@ -1829,13 +1831,13 @@
18291831
* @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
18301832
* control how a matched request is handled.
18311833
*
1832-
* - respond
1834+
* - respond –
18331835
* `{function([status,] data[, headers, statusText])
18341836
* | function(function(method, url, data, headers)}`
1835-
* The respond method takes a set of static data to be returned or a function that can return
1837+
* – The respond method takes a set of static data to be returned or a function that can return
18361838
* an array containing response status (number), response data (string), response headers
18371839
* (Object), and the text for the status (string).
1838-
* - passThrough `{function()}` Any request matching a backend definition with
1840+
* - passThrough – `{function()}` – Any request matching a backend definition with
18391841
* `passThrough` handler will be passed through to the real backend (an XHR request will be made
18401842
* to the server.)
18411843
*/
@@ -2003,6 +2005,7 @@
20032005
* @description
20042006
*
20052007
* *NOTE*: This function is also published on window for easy access.<br>
2008+
* *NOTE*: This function is declared ONLY WHEN running tests with jasmine or mocha
20062009
*
20072010
* This function registers a module configuration code. It collects the configuration information
20082011
* which will be used when the injector is created by {@link angular.mock.inject inject}.
@@ -2045,6 +2048,7 @@
20452048
* @description
20462049
*
20472050
* *NOTE*: This function is also published on window for easy access.<br>
2051+
* *NOTE*: This function is declared ONLY WHEN running tests with jasmine or mocha
20482052
*
20492053
* The inject function wraps a function into an injectable function. The inject() creates new
20502054
* instance of {@link auto.$injector $injector} per test, which is then used for

0 commit comments

Comments
 (0)