From 133ca233945586d57c2b192564e9adebdfbebbac Mon Sep 17 00:00:00 2001 From: junv Date: Tue, 1 Apr 2014 20:58:17 +0800 Subject: [PATCH] remove auto generated js files --- env/dev/constant.js | 1 + env/local/constant.js | 1 + env/prod/constant.js | 1 + gulpfile.js | 22 +++++-- package.json | 9 ++- platforms/android/CordovaLib/CordovaLib.iml | 3 + .../android/CordovaLib/ant-build/build.prop | 2 +- platforms/android/android.iml | 4 ++ .../android/assets/www/dist/js/all.min.js | 7 ++- platforms/android/assets/www/index.html | 1 - .../app/controllers/books-controller.coffee | 6 +- .../js/app/controllers/home-controller.coffee | 2 +- .../assets/www/templates/modal/comment.html | 5 +- platforms/ios/www/dist/js/all.min.js | 7 ++- platforms/ios/www/index.html | 1 - .../app/controllers/books-controller.coffee | 6 +- .../js/app/controllers/home-controller.coffee | 2 +- .../ios/www/templates/modal/comment.html | 5 +- .../src/org.apache.cordova.geolocation.iml | 1 + www/index.html | 1 - .../app/controllers/books-controller.coffee | 6 +- www/js/app/controllers/controllers.coffee | 57 +++++++++++++++++++ www/js/app/controllers/home-controller.coffee | 2 +- www/js/app/services/services.coffee | 12 ++++ www/templates/modal/comment.html | 5 +- 25 files changed, 138 insertions(+), 31 deletions(-) create mode 100644 env/dev/constant.js create mode 100644 env/local/constant.js create mode 100644 env/prod/constant.js create mode 100644 www/js/app/controllers/controllers.coffee create mode 100644 www/js/app/services/services.coffee diff --git a/env/dev/constant.js b/env/dev/constant.js new file mode 100644 index 0000000..799ba87 --- /dev/null +++ b/env/dev/constant.js @@ -0,0 +1 @@ +baseUrl = "http://libr.herokuapp.com/api/v1" diff --git a/env/local/constant.js b/env/local/constant.js new file mode 100644 index 0000000..de48025 --- /dev/null +++ b/env/local/constant.js @@ -0,0 +1 @@ +baseUrl = "http://localhost:3000/api/v1" diff --git a/env/prod/constant.js b/env/prod/constant.js new file mode 100644 index 0000000..799ba87 --- /dev/null +++ b/env/prod/constant.js @@ -0,0 +1 @@ +baseUrl = "http://libr.herokuapp.com/api/v1" diff --git a/gulpfile.js b/gulpfile.js index dba8f71..c8f21fd 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -4,18 +4,26 @@ var coffee = require('gulp-coffee'); var concat = require('gulp-concat'); var minifyCSS = require('gulp-minify-css'); var uglify = require('gulp-uglify'); +var exec = require('gulp-exec'); var paths = { - scripts: ['www/js/app/utils/*.coffee', + scripts: [ + 'www/js/app/utils/*.coffee', 'www/js/app/handler/*.coffee', 'www/js/app/services/*.coffee', 'www/js/app/controllers/*.coffee', 'www/js/*.coffee'], css: ['www/css/*.css'], - fonts: ['www/fonts/*.*'] + fonts: ['www/fonts/*.*'], + dev:['env/dev/**.js'], + local:['env/local/**.js'], + prod:['env/local/**.js'] }; +var options = { + silent: false + }; gulp.task('css', function () { var opts = { @@ -30,7 +38,7 @@ gulp.task('css', function () { }); gulp.task('scripts', function () { - gulp.src(paths.scripts) + gulp.src(paths.scripts.concat(paths.dev)) .pipe(coffee()) .pipe(uglify({mangle: false})) .pipe(concat('all.min.js')) @@ -45,8 +53,14 @@ gulp.task('fonts', function () { gulp.task('watch', function () { gulp.watch(paths.scripts, ['scripts']); gulp.watch(paths.css, ['css']); + }); -gulp.task('default', ['scripts', 'css', 'watch','fonts']); +gulp.task('server',function(){ + gulp.src('') + .pipe(exec('http-server ./www/ -p 4000'),options); +}); + +gulp.task('default', ['scripts', 'css', 'watch','fonts','server']); gulp.task('dist',['scripts','css','fonts']); diff --git a/package.json b/package.json index e2119f7..adf1fcf 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,11 @@ "gulp-coffee": ">=1.4.1", "gulp-minify-css":">= 0.3.0", "gulp-concat":">=2.1.7", - "gulp-uglify":">=0.2.1" - } + "gulp-uglify":">=0.2.1t", + "gulp-exec":">=1.0.4" + }, + "scripts": { + "preinstall": "npm install -g http-server" + } + } diff --git a/platforms/android/CordovaLib/CordovaLib.iml b/platforms/android/CordovaLib/CordovaLib.iml index b436b2c..d62c7e1 100644 --- a/platforms/android/CordovaLib/CordovaLib.iml +++ b/platforms/android/CordovaLib/CordovaLib.iml @@ -6,6 +6,9 @@