Commit 6cf92ac3 authored by Kaido Kert's avatar Kaido Kert Committed by Sam Saccone

Update angular version 1.4.1->1.4.3, add angular-resource

parent 5aeef166
/**
* @license AngularJS v1.4.1
* @license AngularJS v1.4.3
* (c) 2010-2015 Google, Inc. http://angularjs.org
* License: MIT
*/
......@@ -412,7 +412,9 @@ function $RouteProvider() {
* @name $route#$routeChangeSuccess
* @eventType broadcast on root scope
* @description
* Broadcasted after a route dependencies are resolved.
* Broadcasted after a route change has happened successfully.
* The `resolve` dependencies are now available in the `current.locals` property.
*
* {@link ngRoute.directive:ngView ngView} listens for the directive
* to instantiate the controller and render the view.
*
......@@ -596,9 +598,8 @@ function $RouteProvider() {
if (angular.isFunction(templateUrl)) {
templateUrl = templateUrl(nextRoute.params);
}
templateUrl = $sce.getTrustedResourceUrl(templateUrl);
if (angular.isDefined(templateUrl)) {
nextRoute.loadedTemplateUrl = templateUrl;
nextRoute.loadedTemplateUrl = $sce.valueOf(templateUrl);
template = $templateRequest(templateUrl);
}
}
......
......@@ -4,10 +4,11 @@
"test": "karma start test/config/karma.conf.js"
},
"dependencies": {
"angular": "^1.4.1",
"angular": "^1.4.3",
"todomvc-common": "^1.0.0",
"todomvc-app-css": "^1.0.1",
"angular-route": "^1.3.12"
"angular-route": "^ 1.4.3",
"angular-resource": "^1.4.3"
},
"devDependencies": {
"angular-mocks": "^1.3.12",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment