update npm modules and bower modules

7 files changed, 15 insertions, 22 deletions

diff --git a/js/vendor/angular-route/.bower.json b/js/vendor/angular-route/.bower.json
index d6cda2473..8ca74fbb2 100644
--- a/js/vendor/angular-route/.bower.json
+++ b/js/vendor/angular-route/.bower.json
@@ -1,17 +1,17 @@
 {
   "name": "angular-route",
-  "version": "1.4.0-build.3834+sha.75725b4",
+  "version": "1.4.0-build.3861+sha.2c4ffd6",
   "main": "./angular-route.js",
   "ignore": [],
   "dependencies": {
-    "angular": "1.4.0-build.3834+sha.75725b4"
+    "angular": "1.4.0-build.3861+sha.2c4ffd6"
   },
   "homepage": "https://github.com/angular/bower-angular-route",
-  "_release": "1.4.0-build.3834+sha.75725b4",
+  "_release": "1.4.0-build.3861+sha.2c4ffd6",
   "_resolution": {
     "type": "version",
-    "tag": "v1.4.0-build.3834+sha.75725b4",
-    "commit": "90391b09a91cc20b15e6f1bc2b9290ddfaefa9e6"
+    "tag": "v1.4.0-build.3861+sha.2c4ffd6",
+    "commit": "4a40fd1ba34f0f9c49d54ef0336bf80d69dfdbfc"
   },
   "_source": "git://github.com/angular/bower-angular-route.git",
   "_target": "~1.4.*",
diff --git a/js/vendor/angular-route/README.md b/js/vendor/angular-route/README.md
index b33a0dc33..2cd4f9091 100644
--- a/js/vendor/angular-route/README.md
+++ b/js/vendor/angular-route/README.md
@@ -14,21 +14,12 @@ You can install this package either with `npm` or with `bower`.
 npm install angular-route
 ```
 
-Add a `<script>` to your `index.html`:
-
-```html
-<script src="/node_modules/angular-route/angular-route.js"></script>
-```
-
 Then add `ngRoute` as a dependency for your app:
 
 ```javascript
-angular.module('myApp', ['ngRoute']);
+angular.module('myApp', [require('angular-route')]);
 ```
 
-Note that this package is not in CommonJS format, so doing `require('angular-route')` will
-return `undefined`.
-
 ### bower
 
 ```shell
@@ -56,7 +47,7 @@ Documentation is available on the
 
 The MIT License
 
-Copyright (c) 2010-2012 Google, Inc. http://angularjs.org
+Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/js/vendor/angular-route/angular-route.js b/js/vendor/angular-route/angular-route.js
index 189fd6c75..643a485ba 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.3834+sha.75725b4
+ * @license AngularJS v1.4.0-build.3861+sha.2c4ffd6
  * (c) 2010-2015 Google, Inc. http://angularjs.org
  * License: MIT
  */
diff --git a/js/vendor/angular-route/angular-route.min.js b/js/vendor/angular-route/angular-route.min.js
index 3a390266c..64ef25939 100644
--- a/js/vendor/angular-route/angular-route.min.js
+++ b/js/vendor/angular-route/angular-route.min.js
@@ -1,5 +1,5 @@
 /*
- AngularJS v1.4.0-build.3834+sha.75725b4
+ AngularJS v1.4.0-build.3861+sha.2c4ffd6
  (c) 2010-2015 Google, Inc. http://angularjs.org
  License: MIT
 */
diff --git a/js/vendor/angular-route/bower.json b/js/vendor/angular-route/bower.json
index aac578566..8f177498c 100644
--- a/js/vendor/angular-route/bower.json
+++ b/js/vendor/angular-route/bower.json
@@ -1,9 +1,9 @@
 {
   "name": "angular-route",
-  "version": "1.4.0-build.3834+sha.75725b4",
+  "version": "1.4.0-build.3861+sha.2c4ffd6",
   "main": "./angular-route.js",
   "ignore": [],
   "dependencies": {
-    "angular": "1.4.0-build.3834+sha.75725b4"
+    "angular": "1.4.0-build.3861+sha.2c4ffd6"
   }
 }
diff --git a/js/vendor/angular-route/index.js b/js/vendor/angular-route/index.js
new file mode 100644
index 000000000..9ed2645e4
--- /dev/null
+++ b/js/vendor/angular-route/index.js
@@ -0,0 +1,2 @@
+require('./angular-route');
+module.exports = 'ngRoute';
diff --git a/js/vendor/angular-route/package.json b/js/vendor/angular-route/package.json
index 81f1147e7..c6e47b10e 100644
--- a/js/vendor/angular-route/package.json
+++ b/js/vendor/angular-route/package.json
@@ -1,8 +1,8 @@
 {
   "name": "angular-route",
-  "version": "1.4.0-build.3834+sha.75725b4",
+  "version": "1.4.0-build.3861+sha.2c4ffd6",
   "description": "AngularJS router module",
-  "main": "angular-route.js",
+  "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },