Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Popover final #383

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Popover final #383

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
06fd84c
Merge pull request #1 from Grasia/master
Apr 9, 2017
22bec23
gulpfile error handlers for pipes added
May 29, 2017
21a3017
Merge branch 'master' of https://github.com/krshubham/teem
May 29, 2017
87894a9
Added basic popover
Jun 19, 2017
aa7fcce
Merge remote-tracking branch 'upstream/master'
Jun 20, 2017
9dd4e63
Some changes in the popover
Jun 20, 2017
a5e7980
Added some stable changes to popover
Jun 22, 2017
46b44a9
separating bug fixes
Jun 22, 2017
83da6ea
Popover added + gulpfile fix
Jun 22, 2017
16881d7
Removed jshint warnings
Jun 22, 2017
997258f
Added automatic pull of teemlp docker image
Jun 23, 2017
092dc6f
Merge branch 'master' into popover-final
Aug 29, 2017
dada231
some final corrections added
Aug 29, 2017
7b91689
Corrected issues related for pull#380
Aug 28, 2017
cf09fb8
Added max-width and max-height for popover image
Aug 31, 2017
4701fbe
Moved css to pad.sass
Aug 31, 2017
922e961
Fixed color in pad sass
Sep 1, 2017
e33c15c
gulpfile restored to grasia/teem:master
Sep 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 68 additions & 20 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,16 @@ var gulp = require('gulp'),
spawn = require('child_process').spawn,
gutil = require('gulp-util');

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes in gulpfile should go to the pull request about error handling in gulp

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll be fixing this soon! Sorry about this, I didn't check that I had updated gulpfile here


/**
* Logs the error occured in the pipe without killing the gulp process
* emits an end event to the corresponding stream
* @function endErrorProcess
* @param {Error} err
*/
function endErrorProcess(err){
console.log(err);
this.emit('end');
}
/*================================================
= Report Errors to Console =
================================================*/
Expand All @@ -244,14 +253,16 @@ gulp.task('clean', function () {
path.join(config.dest, 'l10n'),
path.join(config.dest, 'app.manifest')
], { read: false })
.pipe(rimraf());
.pipe(rimraf())
.on('error', endErrorProcess);
});

gulp.task('clean:manifest', function () {
return gulp.src([
path.join(config.dest, 'app.manifest')
], { read: false })
.pipe(rimraf());
.pipe(rimraf())
.on('error', endErrorProcess);
});


Expand Down Expand Up @@ -279,7 +290,8 @@ gulp.task('connect', function() {

gulp.task('livereload', function () {
gulp.src(path.join(config.dest, '*.html'))
.pipe(connect.reload());
.pipe(connect.reload())
.on('error', endErrorProcess);
});


Expand All @@ -295,10 +307,12 @@ gulp.task('images', function () {
progressive: true,
svgoPlugins: [{removeViewBox: false}],
use: [pngcrush()]
}));
}))
.on('error', endErrorProcess);
}

return stream.pipe(gulp.dest(path.join(config.dest, 'images')));
return stream.pipe(gulp.dest(path.join(config.dest, 'images')))
.on('error', endErrorProcess);
});


Expand All @@ -308,7 +322,8 @@ gulp.task('images', function () {

gulp.task('fonts', function() {
return gulp.src(config.vendor.fonts)
.pipe(gulp.dest(path.join(config.dest, 'fonts')));
.pipe(gulp.dest(path.join(config.dest, 'fonts')))
.on('error', endErrorProcess);
});

/*==================================
Expand All @@ -317,7 +332,8 @@ gulp.task('fonts', function() {

gulp.task('l10n', function() {
return gulp.src('src/l10n/**/*')
.pipe(gulp.dest(path.join(config.dest, 'l10n')));
.pipe(gulp.dest(path.join(config.dest, 'l10n')))
.on('error', endErrorProcess);
});


Expand Down Expand Up @@ -358,7 +374,9 @@ function buildHtml (env) {

return gulp.src(['src/html/**/*.html'])
.pipe(replace('<!-- inject:js -->', inject.join('\n ')))
.pipe(gulp.dest(config.dest));
.on('error', endErrorProcess)
.pipe(gulp.dest(config.dest))
.on('error', endErrorProcess);
}

gulp.task('html', function() {
Expand All @@ -377,10 +395,12 @@ gulp.task('html:production', function() {
gulp.task('sass', function () {
gulp.src('./src/sass/app.sass')
.pipe(sourcemaps.init())
.on('error', endErrorProcess)
.pipe(sass({
includePaths: [ path.resolve(__dirname, 'src/sass'), path.resolve(__dirname, 'bower_components'), path.resolve(__dirname, 'bower_components/bootstrap-sass/assets/stylesheets') ]
}).on('error', sass.logError))
.pipe(postcss([ autoprefixer({ browsers: ['last 2 versions', 'Android >= 4'] }) ]))
.on('error', endErrorProcess)
/* Currently not working with sourcemaps
.pipe(mobilizer('app.css', {
'app.css': {
Expand All @@ -394,11 +414,15 @@ gulp.task('sass', function () {
}))
*/
.pipe(gulpif(config.cssmin, cssmin()))
.on('error', endErrorProcess)
.pipe(rename({suffix: '.min'}))
.on('error', endErrorProcess)
.pipe(sourcemaps.write('.', {
sourceMappingURLPrefix: '/css/'
}))
.pipe(gulp.dest(path.join(config.dest, 'css')));
.on('error', endErrorProcess)
.pipe(gulp.dest(path.join(config.dest, 'css')))
.on('error', endErrorProcess);
});

/*====================================================================
Expand All @@ -408,7 +432,9 @@ gulp.task('sass', function () {
gulp.task('jshint', function() {
return gulp.src('./src/js/**/*.js')
.pipe(jshint())
.pipe(jshint.reporter('jshint-stylish'));
.on('error', endErrorProcess)
.pipe(jshint.reporter('jshint-stylish'))
.on('error', endErrorProcess);
});


Expand All @@ -422,44 +448,61 @@ gulp.task('js:app', function() {
return streamqueue({ objectMode: true },
// Vendor: angular, mobile-angular-ui, etc.
gulp.src(config.vendor.js)
.pipe(sourcemaps.init()),
.pipe(sourcemaps.init())
.on('error', endErrorProcess),
// app.js is configured
gulp.src('./src/js/app.js')
.pipe(sourcemaps.init())
.on('error', endErrorProcess)
.pipe(replace('value(\'config\', {}). // inject:app:config',
'value(\'config\', ' + JSON.stringify(config.app) + ').'))
.on('error', endErrorProcess)
.pipe(babel({
presets: ['es2015']
})),
}))
.on('error', endErrorProcess),
// rest of app logic
gulp.src(['./src/js/**/*.js', '!./src/js/app.js', '!./src/js/widgets.js'])
.pipe(sourcemaps.init())
.on('error', endErrorProcess)
.pipe(babel({
presets: ['es2015'],
plugins: ['transform-object-assign']
}))
.pipe(ngFilesort()),
.on('error', endErrorProcess)
.pipe(ngFilesort())
.on('error', endErrorProcess),
// app templates
gulp.src(['src/templates/**/*.html']).pipe(templateCache({ module: 'Teem' }))
.pipe(sourcemaps.init())
.on('error', endErrorProcess)
.pipe(babel({
presets: ['es2015']
}))
.on('error', endErrorProcess)
)
.pipe(concat('app.js'))
.on('error', endErrorProcess)
.pipe(ngAnnotate())
.on('error', endErrorProcess)
.pipe(gulpif(config.uglify, uglify()))
.on('error', endErrorProcess)
.pipe(rename({suffix: '.min'}))
.on('error', endErrorProcess)
.pipe(sourcemaps.write('.', {
sourceMappingURLPrefix: '/js/'
}))
.pipe(gulp.dest(path.join(config.dest, 'js')));
.on('error', endErrorProcess)
.pipe(gulp.dest(path.join(config.dest, 'js')))
.on('error', endErrorProcess);
});

gulp.task('js:widgets', function() {
return gulp.src('./src/js/widgets.js')
.pipe(uglify())
.pipe(gulp.dest(path.join(config.dest, 'js')));
.on('error', endErrorProcess)
.pipe(gulp.dest(path.join(config.dest, 'js')))
.on('error', endErrorProcess);
});


Expand All @@ -481,7 +524,8 @@ gulp.task('cordova:sync:clean', function() {

return gulp.src([dest],
{ read: false })
.pipe(rimraf());
.pipe(rimraf())
.on('error', endErrorProcess);


});
Expand All @@ -493,7 +537,8 @@ gulp.task('cordova:sync:copy', function() {


return gulp.src([ source + '{cordova.js,cordova_plugins.js,plugins/**/*}'])
.pipe(gulp.dest(dest));
.pipe(gulp.dest(dest))
.on('error', endErrorProcess);
});

gulp.task('cordova:sync', function(cb) {
Expand All @@ -503,7 +548,8 @@ gulp.task('cordova:sync', function(cb) {

gulp.task('cordova', function() {
return gulp.src('src/vendor/cordova/**/*')
.pipe(gulp.dest(path.join(config.dest, 'js/cordova')));
.pipe(gulp.dest(path.join(config.dest, 'js/cordova')))
.on('error', endErrorProcess);
});


Expand All @@ -530,7 +576,9 @@ function buildManifest (env) {
exclude: 'app.manifest',
hash: true
}))
.pipe(gulp.dest(config.dest));
.on('error', endErrorProcess)
.pipe(gulp.dest(config.dest))
.on('error', endErrorProcess);
}

gulp.task('manifest', function(){
Expand Down
Loading