jshint issues

This commit is contained in:
Kasper Moskwiak 2015-09-16 19:02:07 +02:00
parent baf3f1340e
commit 7b3ca93469

View file

@ -17,12 +17,12 @@
player = this,
label = document.createElement('span');
label.classList.add('vjs-resolution-button-label')
label.classList.add('vjs-resolution-button-label');
/*
* Resolution menu item
*/
var MenuItem = videojs.getComponent('MenuItem')
var MenuItem = videojs.getComponent('MenuItem');
var ResolutionMenuItem = videojs.extends(MenuItem, {
constructor: function(player, options){
@ -30,31 +30,31 @@
this.src = options.src;
this.type = options.type;
this.on('click', this.onClick)
this.on('touchstart', this.onClick)
this.on('click', this.onClick);
this.on('touchstart', this.onClick);
},
onClick: function(){
// Hide bigPlayButton
player.bigPlayButton.hide()
player.bigPlayButton.hide();
// Remember player state
var currentTime = player.currentTime()
var isPaused = player.paused()
var currentTime = player.currentTime();
var isPaused = player.paused();
// Change menu button label
label.innerHTML = this.options_.label;
// Change player source and wait for loadedmetadata event, then play video
player.src({src: this.src, type: this.type}).one( 'loadedmetadata', function() {
player.currentTime(currentTime)
if(!isPaused){ player.play() }
player.trigger('resolutionchange')
})
player.currentTime(currentTime);
if(!isPaused){ player.play(); }
player.trigger('resolutionchange');
});
}
})
});
/*
* Resolution menu button
*/
var MenuButton = videojs.getComponent('MenuButton')
var MenuButton = videojs.getComponent('MenuButton');
var ResolutionMenuButton = videojs.extends(MenuButton, {
constructor: function(player, options){
this.sources = options.sources;
@ -62,11 +62,11 @@
this.controlText('Quality');
if(settings.dynamicLabel){
this.el().appendChild(label)
this.el().appendChild(label);
}else{
var staticLabel = document.createElement('span')
staticLabel.classList.add('vjs-resolution-button-staticlabel')
this.el().appendChild(staticLabel)
var staticLabel = document.createElement('span');
staticLabel.classList.add('vjs-resolution-button-staticlabel');
this.el().appendChild(staticLabel);
}
},
createItems: function(){
@ -77,31 +77,31 @@
label: sources[i].label,
src: sources[i].src,
type: sources[i].type
}))
}));
}
return menuItems;
}
})
});
player.updateSrc = function(src){
//Return current src if src is not given
if(!src){ return player.src() }
if(!src){ return player.src(); }
// Dispose old resolution menu button before adding new sources
if(player.controlBar.resolutionSwitcher){
player.controlBar.resolutionSwitcher.dispose()
delete player.controlBar.resolutionSwitcher
player.controlBar.resolutionSwitcher.dispose();
delete player.controlBar.resolutionSwitcher;
}
//Sort sources
src = src.sort(compareResolutions)
groupedSrc = bucketSources(src)
src = src.sort(compareResolutions);
groupedSrc = bucketSources(src);
var menuButton = new ResolutionMenuButton(player, { sources: src });
menuButton.el().classList.add('vjs-resolution-button')
player.controlBar.resolutionSwitcher = player.controlBar.addChild(menuButton)
var newSource = chooseSrc(src)
label.innerHTML = newSource.label
menuButton.el().classList.add('vjs-resolution-button');
player.controlBar.resolutionSwitcher = player.controlBar.addChild(menuButton);
var newSource = chooseSrc(src);
label.innerHTML = newSource.label;
player.src(newSource);
}
};
/**
* Method used for sorting list of sources
@ -110,7 +110,7 @@
* @returns {Number} result of comparation
*/
function compareResolutions(a, b){
if(!a.res || !b.res) return 0;
if(!a.res || !b.res){ return 0; }
return (+b.res)-(+a.res);
}
@ -124,16 +124,16 @@
label: {},
res: {},
type: {}
}
};
for(var i = 0; i<src.length; i++){
resolutions.label[src[i].label] = resolutions.label[src[i].label] || []
resolutions.res[src[i].res] = resolutions.res[src[i].res] || []
resolutions.type[src[i].type] = resolutions.type[src[i].type] || []
resolutions.label[src[i].label].push(src[i])
resolutions.res[src[i].res].push(src[i])
resolutions.type[src[i].type].push(src[i])
resolutions.label[src[i].label] = resolutions.label[src[i].label] || [];
resolutions.res[src[i].res] = resolutions.res[src[i].res] || [];
resolutions.type[src[i].type] = resolutions.type[src[i].type] || [];
resolutions.label[src[i].label].push(src[i]);
resolutions.res[src[i].res].push(src[i]);
resolutions.type[src[i].type].push(src[i]);
}
return resolutions
return resolutions;
}
/**
@ -142,15 +142,15 @@
* @returns {Object} source object
*/
function chooseSrc(src){
if(settings.default === 'low'){ return src[src.length - 1] }
if(settings.default === 'high'){ return src[0] }
if(groupedSrc.res[settings.default]){ return groupedSrc.res[settings.default][0] }
return src[src.length - 1]
if(settings.default === 'low'){ return src[src.length - 1]; }
if(settings.default === 'high'){ return src[0]; }
if(groupedSrc.res[settings.default]){ return groupedSrc.res[settings.default][0]; }
return src[src.length - 1];
}
// Create resolution switcher for videos form <source> tag inside <video>
if(player.options_.sources.length > 1){
player.updateSrc(player.options_.sources)
player.updateSrc(player.options_.sources);
}
};