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

Commit fa737be

Browse files
committed
Merge branch 'master' into feature/1.6.X/input/added-drop-event-support
2 parents 1e8156a + 8d9984e commit fa737be

File tree

281 files changed

+6913
-7273
lines changed

Some content is hidden

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

281 files changed

+6913
-7273
lines changed

.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
bower_components/**
21
build/**
32
docs/app/assets/js/angular-bootstrap/**
43
docs/config/templates/**
@@ -8,3 +7,4 @@ src/angular.bind.js
87
src/ngParseExt/ucd.js
98
i18n/closure/**
109
tmp/**
10+
vendor/**

.github/ISSUE_TEMPLATE.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ IF YOU DON'T FILL OUT THE FOLLOWING INFORMATION WE MIGHT CLOSE YOUR ISSUE WITHOU
1111
<!-- (check one with "x") -->
1212
- [ ] bug report
1313
- [ ] feature request
14-
- [ ] other (Please do not submit support requests here (see above))
14+
- [ ] other <!--(Please do not submit support requests here - see above)-->
1515

1616
**Current behavior:**
1717
<!-- Describe how the bug manifests / how the current features are insufficient. -->
@@ -27,7 +27,8 @@ https://plnkr.co or similar (you can use this template as a starting point: http
2727
-->
2828

2929
**AngularJS version:** 1.x.y
30-
<!-- Check whether this is still an issue in the most recent stable or in the snapshot AngularJS version (https://code.angularjs.org/snapshot/) -->
30+
<!-- Check whether this is still an issue in the most recent stable or in the snapshot AngularJS
31+
version (https://code.angularjs.org/snapshot/) -->
3132

3233
**Browser:** [all | Chrome XX | Firefox XX | Edge XX | IE XX | Safari XX | Mobile Chrome XX | Android X.X Web Browser | iOS XX Safari | iOS XX UIWebView | iOS XX WKWebView ]
3334
<!-- All browsers where this could be reproduced (and Operating System if relevant) -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!-- General PR submission guidelines https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#submit-pr -->
12
**What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)**
23

34

@@ -15,9 +16,9 @@
1516

1617

1718
**Please check if the PR fulfills these requirements**
18-
- [ ] The commit message follows our guidelines: https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#commit-message-format
19-
- [ ] Tests for the changes have been added (for bug fixes / features)
20-
- [ ] Docs have been added / updated (for bug fixes / features)
19+
- [ ] The commit message follows our [guidelines](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#commits)
20+
- [ ] Fix/Feature: [Docs](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#documentation) have been added/updated
21+
- [ ] Fix/Feature: Tests have been added; existing tests pass
2122

2223
**Other information**:
2324

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ performance/temp*.html
1010
*.swp
1111
angular.js.tmproj
1212
node_modules/
13-
bower_components/
1413
angular.xcodeproj
1514
.idea
1615
*.iml
@@ -19,7 +18,6 @@ angular.xcodeproj
1918
libpeerconnection.log
2019
npm-debug.log
2120
/tmp/
22-
/scripts/bower/bower-*
2321
.vscode
2422
*.log
25-
*.stackdump
23+
*.stackdump

.mailmap

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
Andres Ornelas <aornelas@google.com>
2+
Caitlin Potter <caitpotter88@gmail.com>
3+
Caitlin Potter <caitpotter88@gmail.com> <snowball@defpixel.com>
4+
Di Peng <pengdi@google.com>
5+
Di Peng <pengdi@google.com> <pengdi@go.wustl.edu>
6+
Georgios Kalpakas <kalpakas.g@gmail.com>
7+
Georgios Kalpakas <kalpakas.g@gmail.com> <g.kalpakas@hotmail.com>
8+
Julie Ralph <ju.ralph@gmail.com>
9+
Lucas Galfaso <lgalfaso@gmail.com>
10+
Martin Staffa <mjstaffa@gmail.com>
11+
Martin Staffa <mjstaffa@gmail.com> <mjstaffa@googlemail.com>
12+
Matias Niemelä <matias@yearofmoo.com>
13+
Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
14+
Misko Hevery <misko@hevery.com>
15+
Misko Hevery <misko@hevery.com> <misko@google.com>
16+
Igor Minar <igor@angularjs.org>
17+
Igor Minar <igor@angularjs.org> <iiminar@gmail.com>
18+
Igor Minar <igor@angularjs.org> <iminar@google.com>
19+
Igor Minar <igor@angularjs.org> <iminar@dhcp-172-19-37-154.mtv.corp.google.com>
20+
Pawel Kozlowski <pkozlowski.opensource@gmail.com>
21+
Peter Bacon Darwin <pete@bacondarwin.com>
22+
Rodric Haddad <rody@rodyhaddad.com>
23+
Shahar Talmi <shahar.talmi@gmail.com>
24+
Shahar Talmi <shahar.talmi@gmail.com> <shahart@wix.com>
25+
Shyam Seshadri <shyamseshadri@google.com>
26+
Shyam Seshadri <shyamseshadri@google.com> <shyamseshadri@gmail.com>
27+
Vojta Jina <vojta.jina@gmail.com>
28+
Vojta Jina <vojta.jina@gmail.com> <vojta@gemin-i.org>
29+
Vojta Jina <vojta.jina@gmail.com> <vojta@google.com>

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6
1+
8

.travis.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
language: node_js
22
sudo: false
33
node_js:
4-
- '6'
4+
- '8'
55

66
cache:
77
yarn: true
8-
directories:
9-
- bower_components
108

119
branches:
1210
except:
@@ -15,33 +13,24 @@ branches:
1513
env:
1614
matrix:
1715
- JOB=ci-checks
18-
- JOB=unit BROWSER_PROVIDER=saucelabs
19-
- JOB=docs-e2e BROWSER_PROVIDER=saucelabs
16+
- JOB=unit-core BROWSER_PROVIDER=saucelabs
17+
- JOB=unit-jquery BROWSER_PROVIDER=saucelabs
18+
- JOB=docs-app BROWSER_PROVIDER=saucelabs
2019
- JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=saucelabs
2120
- JOB=e2e TEST_TARGET=jquery BROWSER_PROVIDER=saucelabs
2221
global:
23-
# node 4 likes the G++ v4.8 compiler
24-
# see https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Node.js-v4-(or-io.js-v3)-compiler-requirements
25-
- CXX=g++-4.8
2622
- SAUCE_USERNAME=angular-ci
2723
- SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
2824
- LOGS_DIR=/tmp/angular-build/logs
2925
- BROWSER_PROVIDER_READY_FILE=/tmp/browsersprovider-tunnel-ready
3026
- secure: oTBjhnOKhs0qDSKTf7fE4f6DYiNDPycvB7qfSF5QRIbJK/LK/J4UtFwetXuXj79HhUZG9qnoT+5e7lPaiaMlpsIKn9ann7ffqFWN1E8TMtpJF+AGigx3djYElwfgf5nEnFUFhwjFzvbfpZNnxVGgX5YbIZpe/WUbHkP4ffU0Wks=
3127

32-
addons:
33-
apt:
34-
sources:
35-
- ubuntu-toolchain-r-test
36-
packages:
37-
- g++-4.8
38-
3928
before_install:
40-
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.27.5
29+
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.3.2
4130
- export PATH="$HOME/.yarn/bin:$PATH"
4231

4332
before_script:
44-
- du -sh ./node_modules ./bower_components/ || true
33+
- du -sh ./node_modules || true
4534
- "./scripts/travis/before_build.sh"
4635
script:
4736
- "./scripts/travis/build.sh"
@@ -62,31 +51,43 @@ notifications:
6251
jobs:
6352
include:
6453
- stage: deploy
54+
# Don't deploy from PRs. Only deploy from our default branches, or if commit is tagged.
55+
# This is a Travis-specific boolean language: https://docs.travis-ci.com/user/conditional-builds-stages-jobs#Specifying-conditions
56+
# The deployment logic for pushed branches is further defined in scripts\travis\build.sh
57+
if: type != pull_request and (branch =~ ^(v1\.\d+\.x|master)$ or tag IS present)
6558
env:
6659
- JOB=deploy
6760
before_script: skip
6861
script:
69-
- "./scripts/travis/build.sh"
62+
# Export the variables into the current process
63+
- . ./scripts/travis/build.sh
64+
- "echo DEPLOY_DOCS: $DEPLOY_DOCS, DEPLOY_CODE: $DEPLOY_CODE"
65+
after_script: skip
7066
# Work around the 10min Travis timeout so the code.angularjs firebase+gcs code deploy can complete
67+
# Only run the keep_alive once (before_deploy is run for each provider)
7168
before_deploy: |
72-
function keep_alive() {
73-
while true; do
74-
echo -en "\a"
75-
sleep 5
76-
done
77-
}
78-
keep_alive &
69+
if ! [ "$BEFORE_DEPLOY_RUN" ]; then
70+
export BEFORE_DEPLOY_RUN=1;
71+
72+
function keep_alive() {
73+
while true; do
74+
echo -en "\a"
75+
sleep 10
76+
done
77+
}
78+
keep_alive &
79+
fi
7980
deploy:
8081
- provider: firebase
8182
# the upload folder for firebase is configured in /firebase.json
8283
skip_cleanup: true
84+
project: docs-angularjs-org-9p2
8385
token:
8486
secure: $FIREBASE_TOKEN
8587
on:
8688
repo: angular/angular.js
8789
all_branches: true
88-
# deploy a new docs version when the commit is tagged on the "latest" npm version
89-
condition: $TRAVIS_TAG != '' && $( jq ".distTag" "package.json" | tr -d "\"[:space:]" ) = latest
90+
condition: "$DEPLOY_DOCS == true"
9091
- provider: gcs
9192
skip_cleanup: true
9293
access_key_id: GOOGLDB7W2J3LFHICF3R
@@ -98,6 +99,5 @@ jobs:
9899
on:
99100
repo: angular/angular.js
100101
all_branches: true
101-
# upload the build when the commit is tagged or the branch is "master"
102-
condition: $TRAVIS_TAG != '' || ($TRAVIS_PULL_REQUEST = false && $TRAVIS_BRANCH = master)
102+
condition: "$DEPLOY_CODE == true"
103103

CHANGELOG.md

Lines changed: 78 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,80 @@
1+
<a name="1.6.8"></a>
2+
# 1.6.8 beneficial-tincture (2017-12-18)
3+
4+
5+
## Bug Fixes
6+
- **$location:**
7+
- always decode special chars in `$location.url(value)`
8+
([2bdf71](https://github.com/angular/angular.js/commit/2bdf7126878c87474bb7588ce093d0a3c57b0026))
9+
- decode non-component special chars in Hashbang URLS
10+
([57b626](https://github.com/angular/angular.js/commit/57b626a673b7530399d3377dfe770165bec35f8a))
11+
- **ngModelController:** allow $overrideModelOptions to set updateOn
12+
([55516d](https://github.com/angular/angular.js/commit/55516da2dfc7c5798dce24e9fa930c5ac90c900c),
13+
[#16351](https://github.com/angular/angular.js/issues/16351),
14+
[#16364](https://github.com/angular/angular.js/issues/16364))
15+
16+
17+
## New Features
18+
- **$parse:** add a hidden interface to retrieve an expression's AST
19+
([f33d95](https://github.com/angular/angular.js/commit/f33d95cfcff6fd0270f92a142df8794cca2013ad),
20+
[#16253](https://github.com/angular/angular.js/issues/16253),
21+
[#16260](https://github.com/angular/angular.js/issues/16260))
22+
23+
<a name="1.6.7"></a>
24+
# 1.6.7 imperial-backstroke (2017-11-24)
25+
26+
27+
## Bug Fixes
28+
- **$compile:** sanitize special chars in directive name
29+
([c4003f](https://github.com/angular/angular.js/commit/c4003fd03489f876b646f06838f4edb576bacf6f),
30+
[#16314](https://github.com/angular/angular.js/issues/16314),
31+
[#16278](https://github.com/angular/angular.js/issues/16278))
32+
- **$location:** do not decode forward slashes in the path in HTML5 mode
33+
([e06ebf](https://github.com/angular/angular.js/commit/e06ebfdbb558544602fe9da4d7d98045a965f468),
34+
[#16312](https://github.com/angular/angular.js/issues/16312))
35+
- **sanitizeUri:** sanitize URIs that contain IDEOGRAPHIC SPACE chars
36+
([ddeb1d](https://github.com/angular/angular.js/commit/ddeb1df15a23de93eb95dbe202e83e93673e1c4e),
37+
[#16288](https://github.com/angular/angular.js/issues/16288))
38+
- **$rootScope:** fix potential memory leak when removing scope listeners
39+
([358a69](https://github.com/angular/angular.js/commit/358a69fa8b89b251ee44e523458d6c7f40b92b2d),
40+
[#16135](https://github.com/angular/angular.js/issues/16135),
41+
[#16161](https://github.com/angular/angular.js/issues/16161))
42+
- **http:** do not allow encoded callback params in jsonp requests
43+
([569e90](https://github.com/angular/angular.js/commit/569e906a5818271416ad0b749be2f58dc34938bd))
44+
- **ngMock:** pass unexpected request failures in `$httpBackend` to the error handler
45+
([1555a4](https://github.com/angular/angular.js/commit/1555a4911ad5360c145c0ddc8ec6c4bf9a381c13),
46+
[#16150](https://github.com/angular/angular.js/issues/16150),
47+
[#15855](https://github.com/angular/angular.js/issues/15855))
48+
- **ngAnimate:** don't close transitions when child transitions close
49+
([1391e9](https://github.com/angular/angular.js/commit/1391e99c7f73795180b792af21ad4402f96e225d),
50+
[#16210](https://github.com/angular/angular.js/issues/16210))
51+
- **ngMock.browserTrigger:** add 'bubbles' to Transition/Animation Event
52+
([7a5f06](https://github.com/angular/angular.js/commit/7a5f06d55d123a39bb7b030667fb1ab672939598))
53+
54+
55+
## New Features
56+
- **$sanitize, $compileProvider, linky:** add support for the "sftp" protocol in links
57+
([a675ea](https://github.com/angular/angular.js/commit/a675ea034366fbb0fcf0d73fed65216aa99bce11),
58+
[#16102](https://github.com/angular/angular.js/issues/16102))
59+
- **ngModel.NgModelController:** expose $processModelValue to run model -> view pipeline
60+
([145194](https://github.com/angular/angular.js/commit/14519488ce9218aa891d34e89fc3271fd4ed0f04),
61+
[#3407](https://github.com/angular/angular.js/issues/3407),
62+
[#10764](https://github.com/angular/angular.js/issues/10764),
63+
[#16237](https://github.com/angular/angular.js/issues/16237))
64+
- **$injector:** ability to load new modules after bootstrapping
65+
([6e78fe](https://github.com/angular/angular.js/commit/6e78fee73258bb0ae36414f9db2e8734273e481b))
66+
67+
68+
## Performance Improvements
69+
- **jqLite:**
70+
- avoid setting class attribute when not changed
71+
([9c95f6](https://github.com/angular/angular.js/commit/9c95f6d5e00ee7e054aabb3e363f5bfb3b7b4103))
72+
- avoid repeated add/removeAttribute in jqLiteRemoveClass
73+
([cab9eb](https://github.com/angular/angular.js/commit/cab9ebfd5a02e897f802bf6321b8471e4843c5d3),
74+
[#16078](https://github.com/angular/angular.js/issues/16078),
75+
[#16131](https://github.com/angular/angular.js/issues/16131))
76+
77+
178
<a name="1.6.6"></a>
279
# 1.6.6 interdimensional-cable (2017-08-18)
380

@@ -11637,7 +11714,7 @@ There are no breaking changes in this release (promise!)
1163711714
[#4437](https://github.com/angular/angular.js/issues/4437), [#4874](https://github.com/angular/angular.js/issues/4874))
1163811715
- **minErr:** remove references to internal APIs
1163911716
([94764ee0](https://github.com/angular/angular.js/commit/94764ee08910726db1db7a1101c3001500306dea))
11640-
- **ngIf:** don't create multiple elements when changing from a truthy value to another thruthy value
11717+
- **ngIf:** don't create multiple elements when changing from a truthy value to another truthy value
1164111718
([4612705e](https://github.com/angular/angular.js/commit/4612705ec297bc6ba714cb7a98f1be6aff77c4b8),
1164211719
[#4852](https://github.com/angular/angular.js/issues/4852))
1164311720
- **urlUtils:**

0 commit comments

Comments
 (0)