Skip to content

Commit 0afeb8a

Browse files
GulajavaMinistudioGulajavaMinistudio
authored
Merge pull request #169 from angular/master
Enable kustomize in kubectl
2 parents ea2cd9d + a5a98d3 commit 0afeb8a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+2816
-1328
lines changed

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ env:
1515
- JOB=ci-checks
1616
- JOB=unit-core BROWSER_PROVIDER=saucelabs
1717
- JOB=unit-jquery BROWSER_PROVIDER=saucelabs
18+
- JOB=unit-modules BROWSER_PROVIDER=saucelabs
1819
- JOB=docs-app BROWSER_PROVIDER=saucelabs
1920
- JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=saucelabs
2021
- JOB=e2e TEST_TARGET=jquery BROWSER_PROVIDER=saucelabs
@@ -26,7 +27,7 @@ env:
2627
- secure: oTBjhnOKhs0qDSKTf7fE4f6DYiNDPycvB7qfSF5QRIbJK/LK/J4UtFwetXuXj79HhUZG9qnoT+5e7lPaiaMlpsIKn9ann7ffqFWN1E8TMtpJF+AGigx3djYElwfgf5nEnFUFhwjFzvbfpZNnxVGgX5YbIZpe/WUbHkP4ffU0Wks=
2728

2829
before_install:
29-
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.3.2
30+
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.10.1
3031
- export PATH="$HOME/.yarn/bin:$PATH"
3132

3233
before_script:

‎CHANGELOG.md

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,37 @@
1+
<a name="1.7.5"></a>
2+
# 1.7.5 anti-prettification (2018-10-04)
3+
4+
## Bug Fixes
5+
- **ngClass:** do not break on invalid values
6+
([f3a565](https://github.com/angular/angular.js/commit/f3a565872d802c94bb213944791b11b483d52f73),
7+
[#16697](https://github.com/angular/angular.js/issues/16697),
8+
[#16699](https://github.com/angular/angular.js/issues/16699))
9+
10+
11+
<a name="1.7.4"></a>
12+
# 1.7.4 interstellar-exploration (2018-09-07)
13+
14+
## Bug Fixes
15+
- **ngAria.ngClick:** prevent default event on space/enter only for non-interactive elements
16+
([61b335](https://github.com/angular/angular.js/commit/61b33543ff8e7f32464dec98a46bf0a35e9b03a4),
17+
[#16664](https://github.com/angular/angular.js/issues/16664),
18+
[#16680](https://github.com/angular/angular.js/issues/16680))
19+
- **ngAnimate:** remove the "prepare" classes with multiple structural animations
20+
([3105b2](https://github.com/angular/angular.js/commit/3105b2c26a71594c4e7904efc18f4b2e9da25b1b),
21+
[#16681](https://github.com/angular/angular.js/issues/16681),
22+
[#16677](https://github.com/angular/angular.js/issues/16677))
23+
- **$route:** correctly extract path params if the path contains a question mark or a hash
24+
([2ceeb7](https://github.com/angular/angular.js/commit/2ceeb739f35e01fcebcabac4beeeb7684ae9f86d))
25+
- **ngHref:** allow numbers and other objects in interpolation
26+
([30084c](https://github.com/angular/angular.js/commit/30084c13699c814ff6703d7aa2d3947a9b2f7067),
27+
[#16652](https://github.com/angular/angular.js/issues/16652),
28+
[#16626](https://github.com/angular/angular.js/issues/16626))
29+
- **select:** allow to select first option with value `undefined`
30+
([668a33](https://github.com/angular/angular.js/commit/668a33da3439f17e61dfa8f6d9b114ebde8c9d87),
31+
[#16653](https://github.com/angular/angular.js/issues/16653),
32+
[#16656](https://github.com/angular/angular.js/issues/16656))
33+
34+
135
<a name="1.7.3"></a>
236
# 1.7.3 eventful-proposal (2018-08-03)
337

@@ -712,7 +746,7 @@ If you rely on the $modelValue validation, you can overwrite the `min`/`max` val
712746
link: function(scope, element, attrs, ctrl) {
713747
var maxValidator = ctrl.$validators.max;
714748

715-
ctrk.$validators.max = function(modelValue, viewValue) {
749+
ctrl.$validators.max = function(modelValue, viewValue) {
716750
return maxValidator(modelValue, modelValue);
717751
};
718752
}
@@ -1545,7 +1579,7 @@ If you rely on the $modelValue validation, you can overwrite the `min`/`max` val
15451579
link: function(scope, element, attrs, ctrl) {
15461580
var maxValidator = ctrl.$validators.max;
15471581

1548-
ctrk.$validators.max = function(modelValue, viewValue) {
1582+
ctrl.$validators.max = function(modelValue, viewValue) {
15491583
return maxValidator(modelValue, modelValue);
15501584
};
15511585
}

‎Gruntfile.js

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if (!semver.satisfies(currentYarnVersion, expectedYarnVersion)) {
3030
}
3131

3232
// Grunt CLI version checks
33-
var expectedGruntVersion = pkg.engines.grunt;
33+
var expectedGruntVersion = pkg.engines['grunt-cli'];
3434
var currentGruntVersions = exec('grunt --version', {silent: true}).stdout;
3535
var match = /^grunt-cli v(.+)$/m.exec(currentGruntVersions);
3636
if (!match) {
@@ -141,7 +141,16 @@ module.exports = function(grunt) {
141141
'jquery-2.2': 'karma-jquery-2.2.conf.js',
142142
'jquery-2.1': 'karma-jquery-2.1.conf.js',
143143
docs: 'karma-docs.conf.js',
144-
modules: 'karma-modules.conf.js'
144+
'modules-ngAnimate': 'ngAnimate',
145+
'modules-ngAria': 'ngAria',
146+
'modules-ngCookies': 'ngCookies',
147+
'modules-ngMessageFormat': 'ngMessageFormat',
148+
'modules-ngMessages': 'ngMessages',
149+
'modules-ngMock': 'ngMock',
150+
'modules-ngResource': 'ngResource',
151+
'modules-ngRoute': 'ngRoute',
152+
'modules-ngSanitize': 'ngSanitize',
153+
'modules-ngTouch': 'ngTouch'
145154
},
146155

147156

@@ -430,7 +439,16 @@ module.exports = function(grunt) {
430439
grunt.registerTask('test:jquery-2.1', 'Run the jQuery 2.1 unit tests with Karma', ['tests:jquery-2.1']);
431440
grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', [
432441
'build',
433-
'tests:modules'
442+
'tests:modules-ngAnimate',
443+
'tests:modules-ngAria',
444+
'tests:modules-ngCookies',
445+
'tests:modules-ngMessageFormat',
446+
'tests:modules-ngMessages',
447+
'tests:modules-ngMock',
448+
'tests:modules-ngResource',
449+
'tests:modules-ngRoute',
450+
'tests:modules-ngSanitize',
451+
'tests:modules-ngTouch'
434452
]);
435453
grunt.registerTask('test:docs', 'Run the doc-page tests with Karma', ['package', 'tests:docs']);
436454
grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', [

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ piece of cake. Best of all? It makes development fun!
1414

1515
--------------------
1616

17-
##### AngularJS will be moving to Long Term Support (LTS) mode on July 1st 2018: [Find out more](https://docs.angularjs.org/misc/version-support-status)
17+
**On July 1, 2018 AngularJS entered a 3 year Long Term Support period:** [Find out more](https://docs.angularjs.org/misc/version-support-status)
1818

19-
##### Looking for the new Angular? Go here: https://github.com/angular/angular
19+
**Looking for the new Angular? Go here:** https://github.com/angular/angular
2020

2121
--------------------
2222

‎angularFiles.js

Lines changed: 86 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -189,21 +189,84 @@ var angularFiles = {
189189
'src/angular.bind.js'
190190
],
191191

192-
'karmaModules': [
192+
'karmaModulesBase': [
193193
'build/angular.js',
194-
'@angularSrcModules',
194+
'build/angular-mocks.js',
195195
'test/modules/no_bootstrap.js',
196-
'test/helpers/*.js',
197-
'test/ngAnimate/*.js',
198-
'test/ngMessageFormat/*.js',
199-
'test/ngMessages/*.js',
200-
'test/ngMock/*.js',
201-
'test/ngCookies/*.js',
202-
'test/ngRoute/**/*.js',
203-
'test/ngResource/*.js',
204-
'test/ngSanitize/**/*.js',
205-
'test/ngTouch/**/*.js',
206-
'test/ngAria/*.js'
196+
'test/helpers/matchers.js',
197+
'test/helpers/privateMocks.js',
198+
'test/helpers/support.js',
199+
'test/helpers/testabilityPatch.js'
200+
],
201+
202+
'karmaModules-ngAnimate': [
203+
'@karmaModulesBase',
204+
'@angularSrcModuleNgAnimate',
205+
'test/ngAnimate/**/*.js'
206+
],
207+
208+
'karmaModules-ngAria': [
209+
'@karmaModulesBase',
210+
'@angularSrcModuleNgAria',
211+
'test/ngAria/**/*.js'
212+
],
213+
214+
'karmaModules-ngCookies': [
215+
'@karmaModulesBase',
216+
'@angularSrcModuleNgCookies',
217+
'test/ngCookies/**/*.js'
218+
],
219+
220+
'karmaModules-ngMessageFormat': [
221+
'@karmaModulesBase',
222+
'@angularSrcModuleNgMessageFormat',
223+
'test/ngMessageFormat/**/*.js'
224+
],
225+
226+
'karmaModules-ngMessages': [
227+
'@karmaModulesBase',
228+
'build/angular-animate.js',
229+
'@angularSrcModuleNgMessages',
230+
'test/ngMessages/**/*.js'
231+
],
232+
233+
// ngMock doesn't include the base because it must use the ngMock src files
234+
'karmaModules-ngMock': [
235+
'build/angular.js',
236+
'src/ngMock/*.js',
237+
'test/modules/no_bootstrap.js',
238+
'test/helpers/matchers.js',
239+
'test/helpers/privateMocks.js',
240+
'test/helpers/support.js',
241+
'test/helpers/testabilityPatch.js',
242+
'src/routeToRegExp.js',
243+
'build/angular-animate.js',
244+
'test/ngMock/**/*.js'
245+
],
246+
247+
'karmaModules-ngResource': [
248+
'@karmaModulesBase',
249+
'@angularSrcModuleNgResource',
250+
'test/ngResource/**/*.js'
251+
],
252+
253+
'karmaModules-ngRoute': [
254+
'@karmaModulesBase',
255+
'build/angular-animate.js',
256+
'@angularSrcModuleNgRoute',
257+
'test/ngRoute/**/*.js'
258+
],
259+
260+
'karmaModules-ngSanitize': [
261+
'@karmaModulesBase',
262+
'@angularSrcModuleNgSanitize',
263+
'test/ngSanitize/**/*.js'
264+
],
265+
266+
'karmaModules-ngTouch': [
267+
'@karmaModulesBase',
268+
'@angularSrcModuleNgTouch',
269+
'test/ngTouch/**/*.js'
207270
],
208271

209272
'karmaJquery': [
@@ -232,6 +295,16 @@ var angularFiles = {
232295
});
233296
});
234297

298+
angularFiles['angularSrcModuleNgAnimate'] = angularFiles['angularModules']['ngAnimate'];
299+
angularFiles['angularSrcModuleNgAria'] = angularFiles['angularModules']['ngAria'];
300+
angularFiles['angularSrcModuleNgCookies'] = angularFiles['angularModules']['ngCookies'];
301+
angularFiles['angularSrcModuleNgMessageFormat'] = angularFiles['angularModules']['ngMessageFormat'];
302+
angularFiles['angularSrcModuleNgMessages'] = angularFiles['angularModules']['ngMessages'];
303+
angularFiles['angularSrcModuleNgResource'] = angularFiles['angularModules']['ngResource'];
304+
angularFiles['angularSrcModuleNgRoute'] = angularFiles['angularModules']['ngRoute'];
305+
angularFiles['angularSrcModuleNgSanitize'] = angularFiles['angularModules']['ngSanitize'];
306+
angularFiles['angularSrcModuleNgTouch'] = angularFiles['angularModules']['ngTouch'];
307+
235308
angularFiles['angularSrcModules'] = [].concat(
236309
angularFiles['angularModules']['ngAnimate'],
237310
angularFiles['angularModules']['ngMessageFormat'],

‎docs/config/services/deployments/production.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var cdnUrl = googleCdnUrl + versionInfo.cdnVersion;
1515
// docs.angularjs.org and code.angularjs.org need them.
1616
var versionPath = versionInfo.currentVersion.isSnapshot ?
1717
'snapshot' :
18-
(versionInfo.currentVersion.version || versionInfo.currentVersion.version);
18+
versionInfo.currentVersion.version;
1919
var examplesDependencyPath = angularCodeUrl + versionPath + '/';
2020

2121
module.exports = function productionDeployment(getVersion) {

‎docs/config/templates/ngdoc/lib/methods.template.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ <h4>Parameters</h4>
1717
{% endif %}
1818

1919
{% if method.this %}
20-
<h4>Method's {% code %}this{% endcode %}</h4>
20+
<h4>Method's `this`</h4>
2121
{$ method.this | marked $}
2222
{% endif %}
2323

‎docs/config/templates/ngdoc/lib/this.template.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{% if doc.this %}
2-
<h3>Method's {% code %}this{% endcode %}</h3>
2+
<h3>Method's `this`</h3>
33
{$ doc.this | marked $}
4-
{% endif %}
4+
{% endif %}

‎docs/content/api/index.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# AngularJS API Docs
66

77
<div class="alert alert-warning">
8-
**AngularJS will be moving to Long Term Support (LTS) mode on July 1st 2018.**: [Find out more](misc/version-support-status).
8+
**On July 1, 2018 AngularJS entered a 3 year Long Term Support period:** [Find out more](misc/version-support-status).
99
</div>
1010

1111
## Welcome to the AngularJS API docs page.

‎docs/content/guide/index.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ In AngularJS applications, you move the job of filling page templates with data
4343

4444
* **Animation:** {@link guide/animations Core concepts}, {@link ngAnimate ngAnimate API}
4545
* **Security:** {@link guide/security Security Docs}, {@link ng.$sce Strict Contextual Escaping}, {@link ng.directive:ngCsp Content Security Policy}, {@link ngSanitize.$sanitize $sanitize}, [video](https://www.youtube.com/watch?v=18ifoT-Id54)
46-
* **Internationalization and Localization:** {@link guide/i18n AngularJS Guide to i18n and l10n}, {@link ng.filter:date date filter}, {@link ng.filter:currency currency filter}, [Creating multilingual support](http://www.novanet.no/blog/hallstein-brotan/dates/2013/10/creating-multilingual-support-using-angularjs/)
46+
* **Internationalization and Localization:** {@link guide/i18n AngularJS Guide to i18n and l10n}, {@link ng.filter:date date filter}, {@link ng.filter:currency currency filter}, [Creating multilingual support](https://blog.novanet.no/creating-multilingual-support-using-angularjs/)
4747
* **Touch events:** {@link ngTouch Touch events}
4848
* **Accessibility:** {@link guide/accessibility ngAria}
4949

‎docs/content/guide/migration.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ custom directive, as seen in the following example directive definition object:
148148
link: function(scope, element, attrs, ctrl) {
149149
var maxValidator = ctrl.$validators.max;
150150

151-
ctrk.$validators.max = function(modelValue, viewValue) {
151+
ctrl.$validators.max = function(modelValue, viewValue) {
152152
return maxValidator(modelValue, modelValue);
153153
};
154154
}

‎docs/content/guide/security.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ For more information please visit {@link $http#json-vulnerability-protection JSO
102102

103103
Bear in mind that calling `$http.jsonp` gives the remote server (and, if the request is not secured, any Man-in-the-Middle attackers)
104104
instant remote code execution in your application: the result of these requests is handed off
105-
to the browser as regular `<script>` tag.
105+
to the browser as a regular `<script>` tag.
106106

107107
## Strict Contextual Escaping
108108

‎docs/content/misc/version-support-status.ngdoc

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,9 @@
77
This page describes the support status of the significant versions of AngularJS.
88

99
<div class="alert alert-info">
10-
AngularJS is planning one more significant release, version 1.7, and on July 1, 2018 it will enter a 3 year Long Term Support period.
10+
On July 1, 2018 AngularJS entered a 3 year Long Term Support period.
1111
</div>
1212

13-
### Until July 1st 2018
14-
15-
Any version branch not shown in the following table (e.g. 1.5.x) is no longer being developed.
16-
17-
<table class="dev-status table table-bordered">
18-
<thead>
19-
<tr><th>Version</th><th>Status</th><th>Comments</th></tr>
20-
</thead>
21-
<tbody>
22-
<tr class="security"><td><span>1.2.x</span></td><td>Security patches only</td><td>Last version to provide IE 8 support</td></tr>
23-
<tr class="stable"><td><span>1.6.x</span></td><td>Patch Releases</td><td>Minor features, bug fixes, security patches - no breaking changes</td></tr>
24-
<tr class="current"><td><span>1.7.x</span></td><td>Active Development</td><td>1.7.0 (not yet released) will be the last release of AngularJS to contain breaking changes</td></tr>
25-
</tbody>
26-
</table>
27-
28-
### After July 1st 2018
29-
3013
Any version branch not shown in the following table (e.g. 1.6.x) is no longer being developed.
3114

3215
<table class="dev-status table table-bordered">
@@ -36,7 +19,7 @@ Any version branch not shown in the following table (e.g. 1.6.x) is no longer be
3619
<tbody>
3720
<tr class="security">
3821
<td><span>1.2.x</span></td>
39-
<td>Long Term Support</td>
22+
<td>Security patches only</td>
4023
<td>Last version to provide IE 8 support</td>
4124
</tr>
4225
<tr class="stable">
@@ -49,14 +32,16 @@ Any version branch not shown in the following table (e.g. 1.6.x) is no longer be
4932

5033
### Long Term Support
5134

52-
On July 1st 2018, we will enter a Long Term Support period for AngularJS.
35+
On July 1st 2018, AngularJS entered a Long Term Support period for AngularJS.
5336

54-
At this time we will focus exclusively on providing fixes to bugs that satisfy at least one of the following criteria:
37+
We now focus exclusively on providing fixes to bugs that satisfy at least one of the following criteria:
5538

5639
* A security flaw is detected in the 1.7.x branch of the framework
5740
* One of the major browsers releases a version that will cause current production applications using AngularJS 1.7.x to stop working
5841
* The jQuery library releases a version that will cause current production applications using AngularJS 1.7.x to stop working.
5942

43+
AngularJS 1.2.x will get a new version if and only if a new severe security issue is discovered.
44+
6045
### Blog Post
6146

6247
You can read more about these plans in our [blog post announcement](https://blog.angular.io/stable-angularjs-and-long-term-support-7e077635ee9c).

0 commit comments

Comments
 (0)