Skip to content

Commit

Permalink
[update] #15 解决了一个 use 的bug
Browse files Browse the repository at this point in the history
what:
Why:
How:
  • Loading branch information
yandeqiang committed Apr 9, 2018
1 parent 88790b4 commit 9e33a83
Show file tree
Hide file tree
Showing 8 changed files with 258 additions and 59 deletions.
Binary file removed .DS_Store
Binary file not shown.
256 changes: 225 additions & 31 deletions demo/index.html

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions lib/index.browser.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/**
* chimee-plugin-controlbar v0.3.9
* chimee-plugin-controlbar v0.4.1
* (c) 2017 yandeqiang
* Released under ISC
*/
Expand Down Expand Up @@ -7030,7 +7030,12 @@ var chimeeControl = {
operable: false,
penetrate: false,
create: function create() {},
init: function init(videoConfig) {
init: function init(videoConfig) {},
destroy: function destroy() {
window.clearTimeout(this.timeId);
},
inited: function inited() {
var videoConfig = this.$videoConfig;
if (videoConfig.controls) {
this.show = true;
videoConfig.controls = false;
Expand All @@ -7055,11 +7060,7 @@ var chimeeControl = {
this.$wrap = this.$dom.querySelector('chimee-control-wrap');
this.children = createChild(this);
this._setStyle();
},
destroy: function destroy() {
window.clearTimeout(this.timeId);
},
inited: function inited() {

for (var i in this.children) {
this.children[i].inited && this.children[i].inited();
}
Expand Down
15 changes: 8 additions & 7 deletions lib/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/**
* chimee-plugin-controlbar v0.3.9
* chimee-plugin-controlbar v0.4.1
* (c) 2017 yandeqiang
* Released under ISC
*/
Expand Down Expand Up @@ -2580,7 +2580,12 @@ var chimeeControl = {
operable: false,
penetrate: false,
create: function create() {},
init: function init(videoConfig) {
init: function init(videoConfig) {},
destroy: function destroy() {
window.clearTimeout(this.timeId);
},
inited: function inited() {
var videoConfig = this.$videoConfig;
if (videoConfig.controls) {
this.show = true;
videoConfig.controls = false;
Expand All @@ -2605,11 +2610,7 @@ var chimeeControl = {
this.$wrap = this.$dom.querySelector('chimee-control-wrap');
this.children = createChild(this);
this._setStyle();
},
destroy: function destroy() {
window.clearTimeout(this.timeId);
},
inited: function inited() {

for (var i in this.children) {
this.children[i].inited && this.children[i].inited();
}
Expand Down
2 changes: 1 addition & 1 deletion lib/index.min.js

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions lib/index.mjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/**
* chimee-plugin-controlbar v0.3.9
* chimee-plugin-controlbar v0.4.1
* (c) 2017 yandeqiang
* Released under ISC
*/
Expand Down Expand Up @@ -2578,7 +2578,12 @@ var chimeeControl = {
operable: false,
penetrate: false,
create: function create() {},
init: function init(videoConfig) {
init: function init(videoConfig) {},
destroy: function destroy() {
window.clearTimeout(this.timeId);
},
inited: function inited() {
var videoConfig = this.$videoConfig;
if (videoConfig.controls) {
this.show = true;
videoConfig.controls = false;
Expand All @@ -2603,11 +2608,7 @@ var chimeeControl = {
this.$wrap = this.$dom.querySelector('chimee-control-wrap');
this.children = createChild(this);
this._setStyle();
},
destroy: function destroy() {
window.clearTimeout(this.timeId);
},
inited: function inited() {

for (var i in this.children) {
this.children[i].inited && this.children[i].inited();
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chimee-plugin-controlbar",
"version": "0.4.0",
"version": "0.4.1",
"description": "controlbar for chimee",
"main": "lib/index.js",
"module": "lib/index.mjs",
Expand Down
12 changes: 7 additions & 5 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ const chimeeControl = {
penetrate: false,
create () {},
init (videoConfig) {
},
destroy () {
window.clearTimeout(this.timeId);
},
inited () {
const videoConfig = this.$videoConfig;
if(videoConfig.controls) {
this.show = true;
videoConfig.controls = false;
Expand All @@ -73,11 +79,7 @@ const chimeeControl = {
this.$wrap = this.$dom.querySelector('chimee-control-wrap');
this.children = createChild(this);
this._setStyle();
},
destroy () {
window.clearTimeout(this.timeId);
},
inited () {

for(const i in this.children) {
this.children[i].inited && this.children[i].inited();
}
Expand Down

0 comments on commit 9e33a83

Please sign in to comment.