Modify gulpfile.js

docs/Browser.html

@@ -864,7 +864,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
 
-		on 2017/10/12 22:59:52
+		on 2018/05/05 19:03:05
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

docs/Screen.html

@@ -496,7 +496,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
 
-		on 2017/10/12 22:59:52
+		on 2018/05/05 19:03:05
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

docs/ScreenConfig.html

@@ -605,7 +605,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
 
-		on 2017/10/12 22:59:52
+		on 2018/05/05 19:03:05
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

docs/Window.html

@@ -2101,7 +2101,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
 
-		on 2017/10/12 22:59:52
+		on 2018/05/05 19:03:05
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

docs/WindowConfig.html

@@ -1775,7 +1775,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
 
-		on 2017/10/12 22:59:52
+		on 2018/05/05 19:03:05
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

docs/classes.list.html

@@ -207,7 +207,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
 
-		on 2017/10/12 22:59:52
+		on 2018/05/05 19:03:05
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

docs/index.html

@@ -177,7 +177,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
 
-		on 2017/10/12 22:59:52
+		on 2018/05/05 19:03:05
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

gulpfile.js

@@ -1,60 +1,58 @@
 'use strict'
 
 const gulp = require('gulp')
-const fun = require('gulp-fun-style')
 const eslint = require('gulp-eslint')
 const plumber = require('gulp-plumber')
 const mocha = require('gulp-spawn-mocha')
 const jsdoc = require('gulp-jsdoc3')
-
-fun.lint = () =>
-  gulp.src(['src/**/*.js', '!src/**/*.doc.js'])
-      .pipe(plumber())
-      .pipe(eslint())
-      .pipe(eslint.format())
-
-fun.lint.description = 'Lint js source files.'
-
-
-fun.jsdoc = done =>
-  gulp.src(['docs/src/**/*.js', 'README.md'])
-      .pipe(plumber())
-      .pipe(jsdoc(require('./.jsdoc.json'), done))
-
-fun.jsdoc.description = 'Create API document.'
-
-
-fun.test = () =>
-  gulp.src(['src/**/*.test.js', 'test/**/*.test.js'])
-      .pipe(plumber())
-      .pipe(mocha())
-
-fun.test.description = 'Run the unit tests.'
-
-
-fun.coverage = () =>
-  gulp.src(['src/**/*.test.js', 'test/**/*.test.js'])
-      .pipe(plumber())
-      .pipe(mocha({ istanbul: true }))
-
-fun.coverage.description = 'Measure the coverage of the unit tests.'
-
-
-fun.watch_test = {
-  watch: ['src/**/*.js', '!src/**/*.doc.js', 'src/**/*.json'],
-  call: [['lint', 'coverage']]
+const ghelp = require('gulp-showhelp')
+
+var srcs = ['src/**/*.js', 'test/**/*.js']
+var tests = srcs.concat(['src/**/*.json'])
+var docs = ['docs/**/*.js', 'README.md']
+
+gulp.task('help', done => {
+  ghelp.show()
+  done()
+}).help = 'Show help message.'
+
+gulp.task('lint', () => {
+  return gulp.src(srcs)
+    .pipe(plumber())
+    .pipe(eslint())
+    .pipe(eslint.format())
+}).help = 'Lint js source files.'
+
+gulp.task('mkdoc', done => {
+  gulp.src(docs)
+    .pipe(plumber())
+    .pipe(jsdoc(require('./.jsdoc.json'), done))
+}).help = 'Create API document.'
+
+gulp.task('test', () => {
+  return gulp.src(tests)
+    .pipe(plumber())
+    .pipe(mocha())
+}).help = 'Run the unit tests.'
+
+gulp.task('coverage', () => {
+  return gulp.src(tests)
+    .pipe(plumber())
+    .pipe(mocha({ istanbul: true }))
+}).help = 'Measure the coverage of the unit tests.'
+
+
+function watch_for_test() {
+  return gulp.watch(srcs, gulp.series('lint', 'test'))
 }
 
-
-fun.watch_doc = {
-  watch: ['docs/src/**/*.js', 'README.md'],
-  call: [['jsdoc']]
+function watch_for_doc() {
+  return gulp.watch(docs, gulp.series('mkdoc'))
 }
 
-
-fun.watch = ['watch_test', 'watch_doc']
-
-fun.watch.description = 'Watch file changes, then lint, test or jsdoc'
+gulp.task('watch', gulp.parallel(watch_for_test, watch_for_doc))
+  .help = 'Watch file changes, then lint, test or jsdoc'
 
 
-fun.default = [['lint', 'coverage', 'jsdoc']]
+gulp.task('default', gulp.series('lint', 'coverage', 'mkdoc'))
+  .help = 'Default task: lint & coverage & mkdoc'

package.json

@@ -32,9 +32,9 @@
     "coveralls": "^3.0.0",
     "gulp": "^4.0.0",
     "gulp-eslint": "^4.0.2",
-    "gulp-fun-style": "^0.3.2",
     "gulp-jsdoc3": "^2.0.0",
     "gulp-plumber": "^1.2.0",
+    "gulp-showhelp": "^1.2.0",
     "gulp-spawn-mocha": "^5.0.1",
     "istanbul": "^0.4.5",
     "mocha": "^5.1.1",

test/behavior/run-script.test.js

@@ -22,7 +22,7 @@ document.body.innerHTML = '<p>Hello</p>';
 </html>
 `)
     const window = browser.openWindow('http://test/script')
-    window.addEventListener('load', event => {
+    window.addEventListener('load', () => {
       expect(window.document.querySelector('p').textContent).to.equal('Hello')
       done()
     })

test/unit/window/config.test.js

@@ -543,8 +543,8 @@ describe('window/config', () => {
       expect(windowConfig.popup.minSize.height).to.equal(12)
     })
 
-    it('Should use .frame.minOpeningSize.* when .isFrameWindow is true',
-    () => {
+    it('Should use .frame.minOpeningSize.* when .isFrameWindow is true' +
+    '', () => {
       const windowConfig = new WindowConfig({ screen })
       expect(windowConfig.isFrameWindow).to.be.true
 
@@ -586,8 +586,8 @@ describe('window/config', () => {
       expect(windowConfig.popup.minOpeningSize.height).to.equal(18)
     })
 
-    it('Should use .frame.minResizableSize.* when .isFrameWindow is true',
-    () => {
+    it('Should use .frame.minResizableSize.* when .isFrameWindow is true' +
+    '', () => {
       const windowConfig = new WindowConfig({ screen })
       expect(windowConfig.isFrameWindow).to.be.true
 
@@ -802,8 +802,8 @@ describe('window/config', () => {
       expect(windowConfig.popup.minSize.height).to.equal(12)
     })
 
-    it('Should use .popup.minOpeningSize.* when .isFrameWindow is true',
-    () => {
+    it('Should use .popup.minOpeningSize.* when .isFrameWindow is true' +
+    '', () => {
       const windowConfig = new WindowConfig({ screen })
       windowConfig.isFrameWindow = false
       expect(windowConfig.isFrameWindow).to.be.false
@@ -846,8 +846,8 @@ describe('window/config', () => {
       expect(windowConfig.popup.minOpeningSize.height).to.equal(18)
     })
 
-    it('Should use .popup.minResizableSize.* when .isFrameWindow is true',
-    () => {
+    it('Should use .popup.minResizableSize.* when .isFrameWindow is true' +
+    '', () => {
       const windowConfig = new WindowConfig({ screen })
       windowConfig.isFrameWindow = false
       expect(windowConfig.isFrameWindow).to.be.false
@@ -1033,13 +1033,13 @@ describe('window/config', () => {
       expect(a).to.equal('A')
       expect(b).to.equal('B')
       expect(c).to.equal('C')
-      callCount.on ++
+      callCount.on++
     })
     windowConfig.once('event1', (a, b, c) => {
       expect(a).to.equal('A')
       expect(b).to.equal('B')
       expect(c).to.equal('C')
-      callCount.once ++
+      callCount.once++
     })
 
     windowConfig.$events.emit('event1', 'A', 'B', 'C')

test/unit/window/opening.test.js

@@ -244,8 +244,8 @@ describe('window/opening', () => {
       })
     })
 
-    it('Should open a window : url is nullish and target is "_blank"',
-    done => {
+    it('Should open a window : url is nullish and target is "_blank"' +
+    '', done => {
       const win0 = createWindow()
       const win1 = win0.open(null, '_blank')
       expect(win1).to.not.equal(win0)
@@ -447,8 +447,8 @@ describe('window/opening', () => {
       done()
     })
 
-    it('Should open a named frame window even if features is not empty ',
-    done => {
+    it('Should open a named frame window even if features is not empty ' +
+    '', done => {
       browser.contentManager.add('http://sample.com/aaa', '<p>Sample</p>')
 
       const win0 = createWindow()

test/unit/window/window.test.js

@@ -578,8 +578,8 @@ describe('window', () => {
         expect(window.devicePixelRatio).to.equal(1)
       })
 
-      it('Should move to left-top side if specified delta is too small',
-      () => {
+      it('Should move to left-top side if specified delta is too small' +
+      '', () => {
         windowConfig.isFrameWindow = false
         expect(windowConfig.isFrameWindow).to.be.false
         expect(windowConfig.isMovableByScript).to.be.true
@@ -616,8 +616,8 @@ describe('window', () => {
         expect(window.devicePixelRatio).to.equal(1)
       })
 
-      it('Should move to right-bottom side if specified delta are too large',
-      () => {
+      it('Should move to right-bottom side if specified delta are too large' +
+      '', () => {
         windowConfig.isFrameWindow = false
         expect(windowConfig.isFrameWindow).to.be.false
         expect(windowConfig.isMovableByScript).to.be.true
@@ -735,8 +735,8 @@ describe('window', () => {
         expect(window.devicePixelRatio).to.equal(1)
       })
 
-      it('Should resize to minimum size if specified size is too small',
-      () => {
+      it('Should resize to minimum size if specified size is too small' +
+      '', () => {
         windowConfig.isFrameWindow = false
         expect(windowConfig.isFrameWindow).to.be.false
         expect(windowConfig.isResizableByScript).to.be.true
@@ -758,8 +758,8 @@ describe('window', () => {
         expect(window.devicePixelRatio).to.equal(1)
       })
 
-      it('Should resize to screen avail size if specified size is too large',
-      () => {
+      it('Should resize to screen avail size if specified size is too large' +
+      '', () => {
         windowConfig.isFrameWindow = false
         expect(windowConfig.isFrameWindow).to.be.false
         expect(windowConfig.isResizableByScript).to.be.true
@@ -860,8 +860,8 @@ describe('window', () => {
         expect(window.devicePixelRatio).to.equal(1)
       })
 
-      it('Should resize to minimum size if specified delta is too small',
-      () => {
+      it('Should resize to minimum size if specified delta is too small' +
+      '', () => {
         windowConfig.isFrameWindow = false
         expect(windowConfig.isFrameWindow).to.be.false
         expect(windowConfig.isResizableByScript).to.be.true
@@ -883,8 +883,8 @@ describe('window', () => {
         expect(window.devicePixelRatio).to.equal(1)
       })
 
-      it('Should resize to screen avail size if specified delta is too large',
-      () => {
+      it('Should resize to screen avail size if specified delta is too large' +
+      '', () => {
         windowConfig.isFrameWindow = false
         expect(windowConfig.isFrameWindow).to.be.false
         expect(windowConfig.isResizableByScript).to.be.true