diff options
| author | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2015-03-30 19:40:07 +0200 |
|---|---|---|
| committer | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2015-03-30 19:40:07 +0200 |
| commit | 05985bc2965f8a332e98121050ba1f07343bbc0f (patch) | |
| tree | 96ca5d59b7ce3c9d3678dd95d8595145d1d5df08 /js/vendor/angular-route/angular-route.js | |
| parent | eb7fc97f33cadcf041a06915b8f1650a9b4f6bbb (diff) | |
| parent | ee3d2332ec97487893ae5f1f46b599c550b25eb6 (diff) | |
Merge pull request #751 from owncloud/next
Changes for 8.1
Diffstat (limited to 'js/vendor/angular-route/angular-route.js')
| -rw-r--r-- | js/vendor/angular-route/angular-route.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/vendor/angular-route/angular-route.js b/js/vendor/angular-route/angular-route.js index e2ab990c4..c60867011 100644 --- a/js/vendor/angular-route/angular-route.js +++ b/js/vendor/angular-route/angular-route.js @@ -1,5 +1,5 @@ /** - * @license AngularJS v1.4.0-build.3911+sha.e57138d + * @license AngularJS v1.4.0-build.3936+sha.73f3515 * (c) 2010-2015 Google, Inc. http://angularjs.org * License: MIT */ @@ -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, |