Version 6.0.0-rc13

HitkoDev · Dec 15, 2016 · 0c9b737 · 0c9b737
1 parent 1c979c6
commit 0c9b737
Show file tree

Hide file tree

Showing 24 changed files with 169 additions and 107 deletions.
diff --git a/dist/videobox.bundle.js b/dist/videobox.bundle.js
diff --git a/dist/videobox.bundle.map b/dist/videobox.bundle.map
diff --git a/dist/videobox.css.map b/dist/videobox.css.map
diff --git a/dist/videobox.js.map b/dist/videobox.js.map
diff --git a/dist/videobox.min.css b/dist/videobox.min.css
diff --git a/dist/videobox.min.js b/dist/videobox.min.js
diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js
diff --git a/docs/assets/js/search.js b/docs/assets/js/search.js
diff --git a/docs/classes/vbinline.html b/docs/classes/vbinline.html
diff --git a/docs/classes/vbslider.html b/docs/classes/vbslider.html
diff --git a/docs/classes/videobox.html b/docs/classes/videobox.html
diff --git a/docs/globals.html b/docs/globals.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/interfaces/jquery.html b/docs/interfaces/jquery.html
diff --git a/docs/interfaces/jquerystatic.html b/docs/interfaces/jquerystatic.html
diff --git a/docs/interfaces/vboptions.html b/docs/interfaces/vboptions.html
diff --git a/docs/interfaces/vborigin.html b/docs/interfaces/vborigin.html
diff --git a/docs/interfaces/vbslideroptions.html b/docs/interfaces/vbslideroptions.html
diff --git a/docs/interfaces/vbvideo.html b/docs/interfaces/vbvideo.html
diff --git a/gulpfile.js b/gulpfile.js
@@ -98,10 +98,10 @@ gulp.task('images', () => {
 })
 
 gulp.task('scripts:rollup', shell.task([
-    'rollup -c'
+    path.join('node_modules', '.bin', 'rollup') + ' -c'
 ]))
 
-var bcd = function(options) {
+var bcd = function (options) {
 
     var base = ''
     if ('base' in options && options['base'])
@@ -134,7 +134,7 @@ var bcd = function(options) {
     return through.obj(transform);
 }
 
-var efg = function() {
+var efg = function () {
 
     function transform(file, encoding, callback) {
         if (file.sourceMap) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "license": "GPL-3.0",
-  "version": "6.0.0-rc12",
+  "version": "6.0.0-rc13",
   "name": "videobox",
   "description": "Pop-up video player plugin",
   "copyright": "Hitko",
@@ -32,7 +32,7 @@
     "@types/jquery": ">=2.0.33",
     "@types/zepto": ">=1.0.27",
     "bourbon": ">=4.2.7",
-    "google-closure-compiler": "^20161024.3.0",
+    "google-closure-compiler": ">=20161024.3.0",
     "gulp": ">=3.9.1",
     "gulp-add-src": ">=0.2.0",
     "gulp-changed": ">=1.3.2",
@@ -53,7 +53,7 @@
     "merge2": ">=1.0.2",
     "rollup": ">=0.36.3",
     "rollup-plugin-sourcemaps": "^0.4.1",
-    "sorcery": "^0.10.0",
+    "sorcery": "git+https://github.com/HitkoDev/sorcery.git",
     "through2": "^2.0.3",
     "typedoc": ">=0.5.1"
   },

diff --git a/src/ts/components/box.ts b/src/ts/components/box.ts
@@ -23,6 +23,8 @@ export class Videobox {
         height: 405,
         closeText: 'Close',
         padding: 30,
+        closeKeys: [27, 81],
+        hideBottom: false,
         root: document.body,
         animation: {
             duration: 500,
@@ -35,10 +37,8 @@ export class Videobox {
     /** @internal */
     constructor(links?: Array<HTMLElement> | string, options: vbOptions = {}, linkMapper?: ((el: HTMLElement) => vbVideo)) {
         this.overlay = <HTMLDivElement>create('div', 'vbOverlay', () => this.close())
-        //this.defaults.root.appendChild(this.overlay)
 
         this.wrap = <HTMLDivElement>create('div', 'vbWrap')
-        //this.defaults.root.appendChild(this.wrap)
 
         this.center = <HTMLDivElement>create('div', 'vbCenter')
         this.wrap.appendChild(this.center)
@@ -72,6 +72,11 @@ export class Videobox {
                 this.setPlayerSizePosition()
         })
 
+        window.addEventListener('keyup', (evt) => {
+            if (this.activeVideo && this.activeVideo.options.closeKeys.indexOf(evt.keyCode) >= 0)
+                this.close()
+        })
+
         if (links)
             this.bind(links, options, linkMapper || this.linkMapper)
     }
@@ -261,14 +266,18 @@ export class Videobox {
     }
 
     private animateBotton(): void {
-        let bottomAnimation = this.bottomContainer.animate([
-            { 'maxHeight': '0px' },
-            { 'maxHeight': '200px' }
-        ], this.activeVideo.options.animation)
-        toggleClass(this.bottomContainer, 'visible', true)
-        bottomAnimation.onfinish = () => this.showVideo()
-        this.animations.push(bottomAnimation)
-        bottomAnimation.play()
+        if (this.activeVideo.options.hideBottom) {
+            this.showVideo()
+        } else {
+            let bottomAnimation = this.bottomContainer.animate([
+                { 'maxHeight': '0px' },
+                { 'maxHeight': '200px' }
+            ], this.activeVideo.options.animation)
+            toggleClass(this.bottomContainer, 'visible', true)
+            bottomAnimation.onfinish = () => this.showVideo()
+            this.animations.push(bottomAnimation)
+            bottomAnimation.play()
+        }
     }
 
     private showVideo(): void {

diff --git a/src/ts/components/helpers.ts b/src/ts/components/helpers.ts
@@ -43,6 +43,16 @@ export interface vbOptions {
      */
     closeTimeout?: number,
 
+    /**
+     * keycodes to close the pop-up / inlie player
+     */
+    closeKeys?: number[],
+
+    /**
+     * if true, the bottom line on the pop-up player won't be displayed
+     */
+    hideBottom?: boolean
+
     /**
      * animation properties (see <a href="https://w3c.github.io/web-animations/">web animations specifications</a>)
      */

diff --git a/src/ts/components/inline.ts b/src/ts/components/inline.ts
@@ -22,6 +22,7 @@ export class VbInline {
         closeText: 'Close',
         padding: 30,
         closeTimeout: 1000,
+        closeKeys: [27, 81],
         animation: {
             duration: 500,
             iterations: 1,
@@ -51,9 +52,13 @@ export class VbInline {
         hide(this.video)
         this.responsive.appendChild(this.video)
 
+        window.addEventListener('keyup', (evt) => {
+            if (this.activeVideo && this.activeVideo.options.closeKeys.indexOf(evt.keyCode) >= 0)
+                this.close()
+        })
+
         if (links)
             this.bind(links, options, linkMapper || this.linkMapper)
-
     }
 
     /**