Fixed #113 - Fix filer-dialogs 404 error messages

mozilla · Mar 28, 2015 · 965903a · 965903a
1 parent 434d085
commit 965903a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,8 @@
 language: node_js
 node_js:
 - '0.10'
+before_install:
+- npm install -g bower
 before_script:
 - npm install -g grunt-cli
 - npm install -g jasmine-node

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -135,6 +135,8 @@ module.exports = function (grunt) {
                             '!thirdparty/CodeMirror2/mode/**/*.html',
                             '!thirdparty/CodeMirror2/**/*test.js',
                             'thirdparty/CodeMirror2/theme/{,*/}*',
+                            'thirdparty/filer-dialogs/bower_components/font-awesome/css/font-awesome.min.css ',
+                            'thirdparty/filer-dialogs/style/style.css',
                             'thirdparty/i18n/*.js',
                             'thirdparty/text/*.js'
                         ]

diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
         "grunt-cleanempty": "1.0.3"
     },
     "scripts": {
-        "postinstall": "grunt install",
+        "postinstall": "cd src/thirdparty/filer-dialogs && bower install && cd ../.. && grunt install",
         "test": "grunt cla-check-pull test && grunt build-browser"
     },
     "licenses": [

diff --git a/src/config.json b/src/config.json
@@ -34,37 +34,42 @@
         "branch": "",
         "SHA": ""
     },
-    "devDependencies": {
+    "dependencies": {
         "grunt": "0.4.1",
-        "jasmine-node": "1.11.0",
-        "grunt-jasmine-node": "0.1.0",
         "grunt-cli": "0.1.9",
-        "phantomjs": "1.9.13",
-        "grunt-lib-phantomjs": "0.3.0",
-        "grunt-contrib-jshint": "0.6.0",
-        "grunt-contrib-watch": "0.4.3",
-        "grunt-contrib-jasmine": "0.4.2",
-        "grunt-template-jasmine-requirejs": "0.1.0",
-        "grunt-contrib-cssmin": "0.6.0",
         "grunt-contrib-clean": "0.4.1",
+        "grunt-contrib-concat": "0.3.0",
         "grunt-contrib-copy": "0.4.1",
+        "grunt-contrib-cssmin": "0.6.0",
         "grunt-contrib-htmlmin": "0.1.3",
+        "grunt-contrib-jasmine": "0.4.2",
+        "grunt-contrib-jshint": "0.6.0",
         "grunt-contrib-less": "0.8.2",
         "grunt-contrib-requirejs": "0.4.1",
         "grunt-contrib-uglify": "0.2.0",
-        "grunt-contrib-concat": "0.3.0",
+        "grunt-contrib-watch": "0.4.3",
+        "grunt-git": "^0.3.4",
+        "grunt-jasmine-node": "0.1.0",
+        "grunt-lib-phantomjs": "0.3.0",
+        "grunt-npm": "git://github.com/sedge/grunt-npm.git#branchcheck",
+        "grunt-shell": "^1.1.2",
         "grunt-targethtml": "0.2.6",
+        "grunt-template-jasmine-requirejs": "0.1.0",
+        "grunt-update-submodules": "^0.4.1",
         "grunt-usemin": "0.1.11",
+        "habitat": "^3.1.2",
+        "jasmine-node": "1.11.0",
+        "jshint": "2.1.4",
         "load-grunt-tasks": "0.2.0",
+        "phantomjs": "1.9.13",
         "q": "0.9.2",
         "semver": "^4.1.0",
-        "jshint": "2.1.4",
         "xmldoc": "^0.1.2",
         "grunt-cleanempty": "1.0.3"
     },
     "scripts": {
-        "postinstall": "grunt install",
-        "test": "grunt cla-check-pull test"
+        "postinstall": "cd src/thirdparty/filer-dialogs && bower install && cd ../../ && grunt install",
+        "test": "grunt cla-check-pull test && grunt build-browser"
     },
     "licenses": [
         {