Merge pull request #4878 from ltegman/fix/emmet-codemirror-plugin

Fix Codemirror Emmet Plugin Support
2015-12-01 20:37:57 -08:00
parent 9c35002a7b 66e01e683d
commit 2428ac69ac
2 changed files with 2 additions and 2 deletions
--- a/gulpfile.js
+++ b/gulpfile.js
@ -85,7 +85,7 @@ var paths = {
    'public/bower_components/CodeMirror/mode/xml/xml.js',
    'public/bower_components/CodeMirror/mode/css/css.js',
    'public/bower_components/CodeMirror/mode/htmlmixed/htmlmixed.js',
-    'public/bower_components/CodeMirror/addon/emmet/emmet.js'
+    'node_modules/emmet-codemirror/dist/emmet.js'
  ],

  vendorMain: [
@ -517,4 +517,3 @@ gulp.task('default', [
  'watch',
  'sync'
 ]);
-
--- a/package.json
+++ b/package.json
@ -44,6 +44,7 @@
    "debug": "^2.2.0",
    "dedent": "~0.6.0",
    "dotenv": "^1.2.0",
+    "emmet-codemirror": "^1.2.5",
    "errorhandler": "^1.4.2",
    "es6-map": "~0.1.1",
    "eslint": "~1.10.2",