Merge pull request #11534 from edx/christina/jquery-npm

Install underscore from npm.
2016-02-12 16:05:30 -05:00
parent a052a304a7 c69226841d
commit 36fc6162f2
4 changed files with 3 additions and 4 deletions
--- a/common/static/js/vendor/underscore-min.js
+++ b/common/static/js/vendor/underscore-min.js
--- a/common/static/js/vendor/underscore-min.js
+++ b/common/static/js/vendor/underscore-min.js
@@ -0,0 +1 @@
+../../../../node_modules/underscore/underscore-min.js
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
  "dependencies": {
    "coffee-script": "1.6.1",
    "edx-pattern-library": "0.10.4",
-    "uglify-js": "2.4.24"
+    "uglify-js": "2.4.24",
+    "underscore": "1.4.4"
  },
  "devDependencies": {
    "jshint": "^2.7.0",
--- a/static/monitoring/package.json
+++ b/static/monitoring/package.json
@@ -21,7 +21,6 @@
        "slickgrid": "2.1",
        "timeago": "0.11.4",
        "tinymce": "4.0.20",
-        "underscore": "1.4.4",
        "urijs": "1.11.2",
        "url": "1.8.4"
    },
--- a/static/monitoring/package.txt
+++ b/static/monitoring/package.txt
@@ -101,7 +101,6 @@
        "tinymce": "4.0.20",
        "tinymce.jquery": "4.0.20",
        // many tinymce plugins...
-        "underscore": "1.4.4",
        "URI": "1.11.2",
        "url": "1.8.4",
        // "urlify": "unknown",
				`@@ -0,0 +1 @@`
				`../../../../node_modules/underscore/underscore-min.js`