Skip to content

Commit 3aceee6

Browse files
committed
v1.5.0-build.4450+sha.9630159
1 parent 21544fb commit 3aceee6

File tree

335 files changed

+6767
-2291
lines changed

Some content is hidden

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

335 files changed

+6767
-2291
lines changed
9.52 MB
Binary file not shown.

snapshot/angular-animate.js

Lines changed: 196 additions & 40 deletions
Large diffs are not rendered by default.

snapshot/angular-animate.min.js

Lines changed: 49 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

snapshot/angular-animate.min.js.map

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

snapshot/angular-aria.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.4.9-build.2+sha.2f08eae
2+
* @license AngularJS v1.5.0-build.4450+sha.9630159
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

snapshot/angular-aria.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.

snapshot/angular-cookies.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.4.9-build.2+sha.2f08eae
2+
* @license AngularJS v1.5.0-build.4450+sha.9630159
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

snapshot/angular-cookies.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.

snapshot/angular-loader.js

Lines changed: 158 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.4.9-build.2+sha.2f08eae
2+
* @license AngularJS v1.5.0-build.4450+sha.9630159
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -59,7 +59,7 @@ function minErr(module, ErrorConstructor) {
5959
return match;
6060
});
6161

62-
message += '\nhttp://errors.angularjs.org/1.4.9-build.2+sha.2f08eae/' +
62+
message += '\nhttp://errors.angularjs.org/1.5.0-build.4450+sha.9630159/' +
6363
(module ? module + '/' : '') + code;
6464

6565
for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
@@ -353,6 +353,162 @@ function setupModuleLoader(window) {
353353
*/
354354
directive: invokeLaterAndSetModuleName('$compileProvider', 'directive'),
355355

356+
/**
357+
* @ngdoc method
358+
* @name angular.Module#component
359+
* @module ng
360+
* @param {string} name Name of the component in camel-case (i.e. myComp which will match as my-comp)
361+
* @param {Object} options Component definition object (a simplified
362+
* {@link ng.$compile#directive-definition-object directive definition object}),
363+
* has the following properties (all optional):
364+
*
365+
* - `controller` – `{(string|function()=}` – Controller constructor function that should be
366+
* associated with newly created scope or the name of a {@link ng.$compile#-controller-
367+
* registered controller} if passed as a string. Empty function by default.
368+
* - `controllerAs` – `{string=}` – An identifier name for a reference to the controller.
369+
* If present, the controller will be published to scope under the `controllerAs` name.
370+
* If not present, this will default to be the same as the component name.
371+
* - `template` – `{string=|function()=}` – html template as a string or a function that
372+
* returns an html template as a string which should be used as the contents of this component.
373+
* Empty string by default.
374+
*
375+
* If `template` is a function, then it is {@link auto.$injector#invoke injected} with
376+
* the following locals:
377+
*
378+
* - `$element` - Current element
379+
* - `$attrs` - Current attributes object for the element
380+
*
381+
* - `templateUrl` – `{string=|function()=}` – path or function that returns a path to an html
382+
* template that should be used as the contents of this component.
383+
*
384+
* If `templateUrl` is a function, then it is {@link auto.$injector#invoke injected} with
385+
* the following locals:
386+
*
387+
* - `$element` - Current element
388+
* - `$attrs` - Current attributes object for the element
389+
* - `bindings` – `{object=}` – Define DOM attribute binding to component properties.
390+
* Component properties are always bound to the component controller and not to the scope.
391+
* - `transclude` – `{boolean=}` – Whether {@link $compile#transclusion transclusion} is enabled.
392+
* Enabled by default.
393+
* - `isolate` – `{boolean=}` – Whether the new scope is isolated. Isolated by default.
394+
* - `restrict` - `{string=}` - String of subset of {@link ng.$compile#-restrict- EACM} which
395+
* restricts the component to specific directive declaration style. If omitted, this defaults to 'E'.
396+
* - `$canActivate` – `{function()=}` – TBD.
397+
* - `$routeConfig` – `{object=}` – TBD.
398+
*
399+
* @description
400+
* Register a component definition with the compiler. This is short for registering a specific
401+
* subset of directives which represents actual UI components in your application. Component
402+
* definitions are very simple and do not require the complexity behind defining directives.
403+
* Component definitions usually consist only of the template and the controller backing it.
404+
* In order to make the definition easier, components enforce best practices like controllerAs
405+
* and default behaviors like scope isolation, restrict to elements and allow transclusion.
406+
*
407+
* <br />
408+
* Here are a few examples of how you would usually define components:
409+
*
410+
* ```js
411+
* var myMod = angular.module(...);
412+
* myMod.component('myComp', {
413+
* template: '<div>My name is {{myComp.name}}</div>',
414+
* controller: function() {
415+
* this.name = 'shahar';
416+
* }
417+
* });
418+
*
419+
* myMod.component('myComp', {
420+
* template: '<div>My name is {{myComp.name}}</div>',
421+
* bindings: {name: '@'}
422+
* });
423+
*
424+
* myMod.component('myComp', {
425+
* templateUrl: 'views/my-comp.html',
426+
* controller: 'MyCtrl as ctrl',
427+
* bindings: {name: '@'}
428+
* });
429+
*
430+
* ```
431+
*
432+
* <br />
433+
* Components are also useful as route templates (e.g. when using
434+
* {@link ngRoute ngRoute}):
435+
*
436+
* ```js
437+
* var myMod = angular.module('myMod', ['ngRoute']);
438+
*
439+
* myMod.component('home', {
440+
* template: '<h1>Home</h1><p>Hello, {{ home.user.name }} !</p>',
441+
* controller: function() {
442+
* this.user = {name: 'world'};
443+
* }
444+
* });
445+
*
446+
* myMod.config(function($routeProvider) {
447+
* $routeProvider.when('/', {
448+
* template: '<home></home>'
449+
* });
450+
* });
451+
* ```
452+
*
453+
* <br />
454+
* When using {@link ngRoute.$routeProvider $routeProvider}, you can often avoid some
455+
* boilerplate, by assigning the resolved dependencies directly on the route scope:
456+
*
457+
* ```js
458+
* var myMod = angular.module('myMod', ['ngRoute']);
459+
*
460+
* myMod.component('home', {
461+
* template: '<h1>Home</h1><p>Hello, {{ home.user.name }} !</p>',
462+
* bindings: {user: '='}
463+
* });
464+
*
465+
* myMod.config(function($routeProvider) {
466+
* $routeProvider.when('/', {
467+
* template: '<home user="$resolve.user"></home>',
468+
* resolve: {user: function($http) { return $http.get('...'); }}
469+
* });
470+
* });
471+
* ```
472+
*
473+
* <br />
474+
* See also {@link ng.$compileProvider#directive $compileProvider.directive()}.
475+
*/
476+
component: function(name, options) {
477+
function factory($injector) {
478+
function makeInjectable(fn) {
479+
if (angular.isFunction(fn)) {
480+
return function(tElement, tAttrs) {
481+
return $injector.invoke(fn, this, {$element: tElement, $attrs: tAttrs});
482+
};
483+
} else {
484+
return fn;
485+
}
486+
}
487+
488+
var template = (!options.template && !options.templateUrl ? '' : options.template);
489+
return {
490+
controller: options.controller || function() {},
491+
controllerAs: identifierForController(options.controller) || options.controllerAs || name,
492+
template: makeInjectable(template),
493+
templateUrl: makeInjectable(options.templateUrl),
494+
transclude: options.transclude === undefined ? true : options.transclude,
495+
scope: options.isolate === false ? true : {},
496+
bindToController: options.bindings || {},
497+
restrict: options.restrict || 'E'
498+
};
499+
}
500+
501+
if (options.$canActivate) {
502+
factory.$canActivate = options.$canActivate;
503+
}
504+
if (options.$routeConfig) {
505+
factory.$routeConfig = options.$routeConfig;
506+
}
507+
factory.$inject = ['$injector'];
508+
509+
return moduleInstance.directive(name, factory);
510+
},
511+
356512
/**
357513
* @ngdoc method
358514
* @name angular.Module#config

snapshot/angular-loader.min.js

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)