Merge pull request codemirror#10 from wesleycho/master

Adapted for change in default Bower component install location
gcziprusz · Jul 11, 2013 · 9b8dfdc · 9b8dfdc
2 parents 7b9ea0c + c54307e
commit 9b8dfdc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -0,0 +1,3 @@
+{
+	"directory": "bower_components"
+}
diff --git a/bower.json b/bower.json
@@ -9,7 +9,7 @@
   "ignore": [
     "**/.*",
     "node_modules",
-    "components",
+    "bower_components",
     "out",
     "test*",
     "demo*",

diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -10,9 +10,9 @@ basePath = '..';
 files = [
   JASMINE,
   JASMINE_ADAPTER,
-  'components/angular/angular.js',
-  'components/angular-mocks/angular-mocks.js',
-  'components/codemirror/lib/codemirror.js',
+  'bower_components/angular/angular.js',
+  'bower_components/angular-mocks/angular-mocks.js',
+  'bower_components/codemirror/lib/codemirror.js',
   'ui-codemirror.js',
   'test/*.spec.js'
 ];