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

Commit c3a0bcc

Browse files
committed
Merge branch 'master' into issue-6828
Conflicts: src/ng/directive/select.js
2 parents 8bc2667 + 920c369 commit c3a0bcc

File tree

672 files changed

+54223
-15810
lines changed

Some content is hidden

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

672 files changed

+54223
-15810
lines changed

.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: node_js
22
node_js:
3-
- 0.10
3+
- '0.10'
44

55
branches:
66
except:
@@ -18,6 +18,11 @@ env:
1818
- LOGS_DIR=/tmp/angular-build/logs
1919
- BROWSER_PROVIDER_READY_FILE=/tmp/sauce-connect-ready
2020

21+
install:
22+
- npm config set registry http://23.251.144.68
23+
# Run npm install twice, because it is flaky.
24+
- npm install || npm install
25+
2126
before_script:
2227
- mkdir -p $LOGS_DIR
2328
- ./lib/sauce/sauce_connect_setup.sh

CHANGELOG.md

Lines changed: 994 additions & 17 deletions
Large diffs are not rendered by default.

CONTRIBUTING.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@ would like to implement a new feature then consider what kind of change it is:
4040
[dev mailing list][angular-dev] or [IRC][irc] so that we can better coordinate our efforts, prevent
4141
duplication of work, and help you to craft the change so that it is successfully accepted into the
4242
project.
43-
* **Small Changes** can be crafted and submitted to [GitHub Repository][github] as a Pull Request.
43+
* **Small Changes** can be crafted and submitted to the [GitHub Repository][github] as a Pull Request.
4444

4545

4646
## <a name="docs"></a> Want a Doc Fix?
47-
If you want to help improve the docs, it's a good idea to let others know what you're working on to
48-
minimize duplication of effort. Before starting, check out the issue queue for [Milestone:Docs Only](https://github.com/angular/angular.js/issues?milestone=24&state=open).
47+
If you want to help improve the docs, it's a good idea to let others know what you're working on to
48+
minimize duplication of effort. Before starting, check out the issue queue for
49+
[Milestone:Docs Only](https://github.com/angular/angular.js/issues?milestone=24&state=open).
4950
Comment on an issue to let others know what you're working on, or create a new issue if your work
5051
doesn't fit within the scope of any of the existing doc fix projects.
5152

@@ -84,7 +85,7 @@ Before you submit your pull request consider the following guidelines:
8485

8586
* Search [GitHub](https://github.com/angular/angular.js/pulls) for an open or closed Pull Request
8687
that relates to your submission. You don't want to duplicate effort.
87-
* Please sign our [Contributor License Agreement (CLA)](#signing-the-cla) before sending pull
88+
* Please sign our [Contributor License Agreement (CLA)](#cla) before sending pull
8889
requests. We cannot accept code without this.
8990
* Make your changes in a new git branch
9091

@@ -93,7 +94,7 @@ Before you submit your pull request consider the following guidelines:
9394
```
9495

9596
* Create your patch, **including appropriate test cases**.
96-
* Follow our [Coding Rules](#coding-rules).
97+
* Follow our [Coding Rules](#rules).
9798
* Run the full Angular test suite, as described in the [developer documentation][dev-doc],
9899
and ensure that all tests pass.
99100
* Commit your changes using a descriptive commit message that follows our
@@ -252,13 +253,14 @@ You can find out more detailed information about contributing in the
252253
253254
254255
255-
[Google Closure I18N library]: https://code.google.com/p/closure-library/source/browse/closure/goog/i18n/
256+
[Google Closure I18N library]: https://github.com/google/closure-library/tree/master/closure/goog/i18n
256257
[angular-dev]: https://groups.google.com/forum/?fromgroups#!forum/angular-dev
257258
[coc]: https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md
258259
[commit-message-format]: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#
259260
[contribute]: http://docs.angularjs.org/misc/contribute
260261
[contributing]: http://docs.angularjs.org/misc/contribute
261262
[corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html
263+
[dev-doc]: https://docs.angularjs.org/guide
262264
[github]: https://github.com/angular/angular.js
263265
[groups]: https://groups.google.com/forum/?fromgroups#!forum/angular
264266
[individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html
@@ -269,6 +271,6 @@ You can find out more detailed information about contributing in the
269271
[ngDocs]: https://github.com/angular/angular.js/wiki/Writing-AngularJS-Documentation
270272
[plunker]: http://plnkr.co/edit
271273
[stackoverflow]: http://stackoverflow.com/questions/tagged/angularjs
272-
[unit-testing]: http://docs.angularjs.org/guide/dev_guide.unit-testing
274+
[unit-testing]: https://docs.angularjs.org/guide/unit-testing
273275
274276
[![Analytics](https://ga-beacon.appspot.com/UA-8594346-11/angular.js/CONTRIBUTING.md?pixel)](https://github.com/igrigorik/ga-beacon)

Gruntfile.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ module.exports = function(grunt) {
107107
options: {
108108
jshintrc: true,
109109
},
110+
tests: {
111+
files: { src: 'test/**/*.js' },
112+
},
110113
ng: {
111114
files: { src: files['angularSrc'] },
112115
},
@@ -119,6 +122,9 @@ module.exports = function(grunt) {
119122
ngLocale: {
120123
files: { src: 'src/ngLocale/**/*.js' },
121124
},
125+
ngMessages: {
126+
files: { src: 'src/ngMessages/**/*.js' },
127+
},
122128
ngMock: {
123129
files: { src: 'src/ngMock/**/*.js' },
124130
},
@@ -187,6 +193,10 @@ module.exports = function(grunt) {
187193
dest: 'build/angular-resource.js',
188194
src: util.wrap(files['angularModules']['ngResource'], 'module')
189195
},
196+
messages: {
197+
dest: 'build/angular-messages.js',
198+
src: util.wrap(files['angularModules']['ngMessages'], 'module')
199+
},
190200
animate: {
191201
dest: 'build/angular-animate.js',
192202
src: util.wrap(files['angularModules']['ngAnimate'], 'module')
@@ -211,6 +221,7 @@ module.exports = function(grunt) {
211221
animate: 'build/angular-animate.js',
212222
cookies: 'build/angular-cookies.js',
213223
loader: 'build/angular-loader.js',
224+
messages: 'build/angular-messages.js',
214225
touch: 'build/angular-touch.js',
215226
resource: 'build/angular-resource.js',
216227
route: 'build/angular-route.js',
@@ -220,8 +231,11 @@ module.exports = function(grunt) {
220231

221232
"ddescribe-iit": {
222233
files: [
234+
'src/**/*.js',
223235
'test/**/*.js',
224-
'!test/ngScenario/DescribeSpec.js'
236+
'!test/ngScenario/DescribeSpec.js',
237+
'!src/ng/directive/attrs.js', // legitimate xit here
238+
'!src/ngScenario/**/*.js'
225239
]
226240
},
227241

TRIAGING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This process based on the idea of minimizing user pain
3434
* Check if there are comments that link to a dupe. If so verify that this is indeed a dupe, [close it][], and go to the last step.
3535
1. Bugs:
3636
* Label `Type: Bug`
37-
* Reproducible? - Steps to reproduce the bug are clear. If they are not,
37+
* Reproducible? - Steps to reproduce the bug are clear. If they are not, ask for a clarification. If there's no reply after a week, [close it][].
3838
* Reproducible on master? - <http://code.angularjs.org/snapshot/>
3939

4040
1. Non bugs:

angularFiles.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ angularFiles = {
4444

4545
'src/ng/directive/directives.js',
4646
'src/ng/directive/a.js',
47-
'src/ng/directive/booleanAttrs.js',
47+
'src/ng/directive/attrs.js',
4848
'src/ng/directive/form.js',
4949
'src/ng/directive/input.js',
5050
'src/ng/directive/ngBind.js',
@@ -80,6 +80,9 @@ angularFiles = {
8080
'ngCookies': [
8181
'src/ngCookies/cookies.js'
8282
],
83+
'ngMessages': [
84+
'src/ngMessages/messages.js'
85+
],
8386
'ngResource': [
8487
'src/ngResource/resource.js'
8588
],
@@ -128,6 +131,7 @@ angularFiles = {
128131
'test/auto/*.js',
129132
'test/ng/**/*.js',
130133
'test/ngAnimate/*.js',
134+
'test/ngMessages/*.js',
131135
'test/ngCookies/*.js',
132136
'test/ngResource/*.js',
133137
'test/ngRoute/**/*.js',
@@ -189,6 +193,7 @@ angularFiles = {
189193

190194
angularFiles['angularSrcModules'] = [].concat(
191195
angularFiles['angularModules']['ngAnimate'],
196+
angularFiles['angularModules']['ngMessages'],
192197
angularFiles['angularModules']['ngCookies'],
193198
angularFiles['angularModules']['ngResource'],
194199
angularFiles['angularModules']['ngRoute'],

css/angular.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak],
44
.ng-cloak, .x-ng-cloak,
5-
.ng-hide {
5+
.ng-hide:not(.ng-animate) {
66
display: none !important;
77
}
88

docs/app/assets/css/docs.css

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,6 @@ h1,h2,h3,h4,h5,h6 {
184184
}
185185

186186
pre {
187-
padding: 15px;
188-
border: 1px solid #ddd;
189-
border-radius: 5px;
190-
display: block;
191187
white-space: pre-wrap;
192188
word-break: normal;
193189
}
@@ -215,6 +211,10 @@ code.highlighted {
215211
color:maroon;
216212
}
217213

214+
ul + p {
215+
margin-top: 10px;
216+
}
217+
218218
.docs-version-jump {
219219
min-width:100%;
220220
max-width:100%;
@@ -257,6 +257,9 @@ code.highlighted {
257257
z-index: 99;
258258
cursor: pointer;
259259
font-size: 16px;
260+
-moz-appearance: none;
261+
text-indent: 0.01px;
262+
text-overflow: '';
260263
}
261264

262265
.picker:after {
@@ -576,6 +579,15 @@ ul.events > li {
576579
margin-bottom:40px;
577580
}
578581

582+
@media only screen and (min-width: 769px) and (max-width: 991px) {
583+
.main-body-grid {
584+
margin-top: 160px;
585+
}
586+
.main-body-grid > .grid-left {
587+
top: 160px;
588+
}
589+
}
590+
579591
@media only screen and (max-width : 768px) {
580592
.picker, .picker select {
581593
width:auto;
40 KB
Loading
61.4 KB
Binary file not shown.
Binary file not shown.

docs/app/assets/js/angular-bootstrap/bootstrap-prettify.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location',
215215
}
216216
});
217217

218-
element.bind('$destroy', function() {
218+
element.on('$destroy', function() {
219219
deregisterEmbedRootScope();
220220
embedRootScope.$destroy();
221221
});

docs/app/assets/js/angular-bootstrap/bootstrap.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,13 +274,13 @@ var popoverElement = function() {
274274
this.contentElement = angular.element(inner.childNodes[1]);
275275

276276
//stop the click on the tooltip
277-
this.element.bind('click', function(event) {
277+
this.element.on('click', function(event) {
278278
event.preventDefault();
279279
event.stopPropagation();
280280
});
281281

282282
var self = this;
283-
angular.element(document.body).bind('click',function(event) {
283+
angular.element(document.body).on('click',function(event) {
284284
if(self.visible()) self.hide();
285285
});
286286
},
@@ -359,7 +359,7 @@ directive.popover = ['popoverElement', function(popover) {
359359
restrict: 'A',
360360
priority : 500,
361361
link: function(scope, element, attrs) {
362-
element.bind('click',function(event) {
362+
element.on('click',function(event) {
363363
event.preventDefault();
364364
event.stopPropagation();
365365
if(popover.isSituatedAt(element) && popover.visible()) {
@@ -396,7 +396,7 @@ directive.foldout = ['$http', '$animate','$window', function($http, $animate, $w
396396
if(/\/build\//.test($window.location.href)) {
397397
url = '/build/docs' + url;
398398
}
399-
element.bind('click',function() {
399+
element.on('click',function() {
400400
scope.$apply(function() {
401401
if(!container) {
402402
if(loading) return;

docs/app/assets/js/angular-bootstrap/dropdown-toggle.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ angular.module('ui.bootstrap.dropdown', [])
3535

3636
this.open = function( dropdownScope ) {
3737
if ( !openScope ) {
38-
$document.bind('click', closeDropdown);
39-
$document.bind('keydown', escapeKeyBind);
38+
$document.on('click', closeDropdown);
39+
$document.on('keydown', escapeKeyBind);
4040
}
4141

4242
if ( openScope && openScope !== dropdownScope ) {
@@ -49,8 +49,8 @@ angular.module('ui.bootstrap.dropdown', [])
4949
this.close = function( dropdownScope ) {
5050
if ( openScope === dropdownScope ) {
5151
openScope = null;
52-
$document.unbind('click', closeDropdown);
53-
$document.unbind('keydown', escapeKeyBind);
52+
$document.off('click', closeDropdown);
53+
$document.off('keydown', escapeKeyBind);
5454
}
5555
};
5656

@@ -124,7 +124,7 @@ angular.module('ui.bootstrap.dropdown', [])
124124
return;
125125
}
126126

127-
element.bind('click', function(event) {
127+
element.on('click', function(event) {
128128
event.preventDefault();
129129
event.stopPropagation();
130130

docs/app/src/directives.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ angular.module('directives', [])
2121
restrict: 'E',
2222
terminal: true,
2323
compile: function(element) {
24-
var linenums = element.hasClass('linenum') || element.parent()[0].nodeName === 'PRE';
25-
var match = /lang-(\S)+/.exec(element.className);
24+
var linenums = element.hasClass('linenum');// || element.parent()[0].nodeName === 'PRE';
25+
var match = /lang-(\S+)/.exec(element[0].className);
2626
var lang = match && match[1];
2727
var html = element.html();
2828
element.html(window.prettyPrintOne(html, lang, linenums));

docs/app/src/docs.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
angular.module('DocsController', [])
22

3-
.controller('DocsController', function($scope, $rootScope, $location, $window, $cookies, NG_PAGES, NG_NAVIGATION, NG_VERSION) {
3+
.controller('DocsController', [
4+
'$scope', '$rootScope', '$location', '$window', '$cookies', 'openPlunkr',
5+
'NG_PAGES', 'NG_NAVIGATION', 'NG_VERSION',
6+
function($scope, $rootScope, $location, $window, $cookies, openPlunkr,
7+
NG_PAGES, NG_NAVIGATION, NG_VERSION) {
8+
9+
10+
$scope.openPlunkr = openPlunkr;
411

512
$scope.docsVersion = NG_VERSION.isSnapshot ? 'snapshot' : NG_VERSION.version;
6-
13+
714
$scope.fold = function(url) {
815
if(url) {
916
$scope.docs_fold = '/notes/' + url;
@@ -120,4 +127,4 @@ angular.module('DocsController', [])
120127
});
121128
}
122129
});
123-
});
130+
}]);

0 commit comments

Comments
 (0)