Skip to content

Commit

Permalink
Version 6.0.0-rc6
Browse files Browse the repository at this point in the history
  • Loading branch information
HitkoDev committed Nov 18, 2016
1 parent a8dbdf9 commit 65f8185
Show file tree
Hide file tree
Showing 24 changed files with 119 additions and 106 deletions.
2 changes: 1 addition & 1 deletion dist/overrides.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/overrides.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions dist/videobox.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/videobox.bundle.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/videobox.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/videobox.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/videobox.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/videobox.min.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions docs/assets/js/main.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions docs/classes/vbinline.html

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions docs/classes/vbslider.html

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions docs/classes/videobox.html

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions docs/globals.html

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions docs/index.html

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions docs/interfaces/jquery.html

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions docs/interfaces/jquerystatic.html

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions docs/interfaces/vboptions.html

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions docs/interfaces/vborigin.html

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions docs/interfaces/vbslideroptions.html

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions docs/interfaces/vbvideo.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"license": "GPL-3.0",
"version": "6.0.0-rc5",
"version": "6.0.0-rc6",
"name": "videobox",
"description": "Pop-up video player plugin",
"copyright": "Hitko",
Expand Down
34 changes: 17 additions & 17 deletions src/sass/overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -128,23 +128,6 @@

.vb_play_button .vb_thub_wrap .vb-icon-play {}

#vbiClose {}

#vbiWrap:hover #vbiClose {}

#vbiClose:hover,
#vbiClose:focus {
color: $primary-light;
}

#vbiResponsive {}

#vbiVideo {}

#vbiWrap {
color: $primary-color;
}

.vb_slider_outer {
.vb_slider_prev,
.vb_slider_next {
Expand All @@ -167,6 +150,23 @@
.vb_slider_wrap {}
}

#vbiClose {}

#vbiWrap:hover #vbiClose {}

#vbiClose:hover,
#vbiClose:focus {
color: $primary-light;
}

#vbiResponsive {}

#vbiVideo {}

#vbiWrap {
color: $primary-color;
}

html.vb-html5-player,
body.vb-html5-player {
*:focus {}
Expand Down
5 changes: 3 additions & 2 deletions src/ts/components/box.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ 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.defaults.root.appendChild(this.overlay)

this.wrap = <HTMLDivElement>create('div', 'vbWrap')
this.defaults.root.appendChild(this.wrap)
//this.defaults.root.appendChild(this.wrap)

this.center = <HTMLDivElement>create('div', 'vbCenter')
this.wrap.appendChild(this.center)
Expand Down Expand Up @@ -117,6 +117,7 @@ export class Videobox {
this.close()

video.options = Object.assign({}, this.defaults, video.options)
if(!video.options.root) video.options.root = document.body
this.setup(video)

let link = video.origin.target
Expand Down
22 changes: 17 additions & 5 deletions src/ts/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,20 @@ import { VideoboxObj as Videobox } from './components/box'
import { VbInlineObj as VbInline } from './components/inline'
import { VbSlider } from './components/slider'

Videobox.bind("a[rel^='videobox']", {
root: <HTMLElement>(document.querySelector(".mdl-layout.mdl-js-layout") || document.body)
})
VbInline.bind("a[rel^='vbinline']")
VbSlider.bind(".vb_slider")
function bindAll() {
Videobox.bind("a[rel^='videobox']", {
root: <HTMLElement>(document.querySelector(".mdl-layout.mdl-js-layout") || document.body)
})
VbInline.bind("a[rel^='vbinline']")
VbSlider.bind(".vb_slider")
}

if (document.readyState != 'loading')
bindAll()
else
document.addEventListener('readystatechange', function ready() {
if (document.readyState != 'loading') {
document.removeEventListener('readystatechange', ready)
bindAll()
}
})

0 comments on commit 65f8185

Please sign in to comment.