Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
todomvc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Sven Franck
todomvc
Commits
c947f59e
Commit
c947f59e
authored
Jun 28, 2015
by
Sam Saccone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🎯
Update angular version
parent
2de650d1
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5701 additions
and
3535 deletions
+5701
-3535
examples/angularjs/node_modules/angular-route/angular-route.js
...les/angularjs/node_modules/angular-route/angular-route.js
+8
-6
examples/angularjs/node_modules/angular/angular.js
examples/angularjs/node_modules/angular/angular.js
+5692
-3528
examples/angularjs/package.json
examples/angularjs/package.json
+1
-1
No files found.
examples/angularjs/node_modules/angular-route/angular-route.js
View file @
c947f59e
/**
* @license AngularJS v1.
3.12
* (c) 2010-201
4
Google, Inc. http://angularjs.org
* @license AngularJS v1.
4.1
* (c) 2010-201
5
Google, Inc. http://angularjs.org
* License: MIT
*/
(
function
(
window
,
angular
,
undefined
)
{
'
use strict
'
;
...
...
@@ -78,8 +78,8 @@ function $RouteProvider() {
* - `controller` – `{(string|function()=}` – Controller fn that should be associated with
* newly created scope or the name of a {@link angular.Module#controller registered
* controller} if passed as a string.
* - `controllerAs` – `{string=}` – A
controller alias name. If present the controller will be
* published to scope under the `controllerAs` name.
* - `controllerAs` – `{string=}` – A
n identifier name for a reference to the controller.
*
If present, the controller will be
published to scope under the `controllerAs` name.
* - `template` – `{string=|function()=}` – html template as a string or a function that
* returns an html template as a string which should be used by {@link
* ngRoute.directive:ngView ngView} or {@link ng.directive:ngInclude ngInclude} directives.
...
...
@@ -440,9 +440,11 @@ function $RouteProvider() {
* @name $route#$routeUpdate
* @eventType broadcast on root scope
* @description
*
* The `reloadOnSearch` property has been set to false, and we are reusing the same
* instance of the Controller.
*
* @param {Object} angularEvent Synthetic event object
* @param {Route} current Current/previous route information.
*/
var
forceReload
=
false
,
...
...
@@ -606,8 +608,8 @@ function $RouteProvider() {
return
$q
.
all
(
locals
);
}
}).
// after route change
then
(
function
(
locals
)
{
// after route change
if
(
nextRoute
==
$route
.
current
)
{
if
(
nextRoute
)
{
nextRoute
.
locals
=
locals
;
...
...
examples/angularjs/node_modules/angular/angular.js
View file @
c947f59e
This diff is collapsed.
Click to expand it.
examples/angularjs/package.json
View file @
c947f59e
...
...
@@ -4,7 +4,7 @@
"test"
:
"karma start test/config/karma.conf.js"
},
"dependencies"
:
{
"angular"
:
"^1.
3.12
"
,
"angular"
:
"^1.
4.1
"
,
"todomvc-common"
:
"^1.0.0"
,
"todomvc-app-css"
:
"^1.0.1"
,
"angular-route"
:
"^1.3.12"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment