specter/CyTube
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Minor fixes/cleanup

Browse source
This commit is contained in:
Calvin Montgomery 2016-08-15 21:09:43 -07:00
parent 4feee02e33
commit ba9fbea1a1
4 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gdrive-userscript/cytube-google-drive.user.js
View file

@ -11,10 +11,6 @@
// ==/UserScript==
(function () {
if (!unsafeWindow.enableCyTubeGoogleDriveUserscript) {
return;
}
function debug(message) {
if (!unsafeWindow.enableCyTubeGoogleDriveUserscriptDebug) {
return;
@ -152,4 +148,5 @@
unsafeWindow.GoogleDrivePlayer = GoogleDrivePlayer;
unsafeWindow.console.log('Initialized userscript Google Drive player');
unsafeWindow.hasDriveUserscript = true;
})();

2
player/update.coffee
View file

@ -32,7 +32,7 @@ window.loadMediaPlayer = (data) ->
console.error e
else if data.type is 'gd'
try
if data.meta.html5hack
if data.meta.html5hack or window.hasDriveUserscript
window.PLAYER = new window.GoogleDrivePlayer(data)
else
window.PLAYER = new GoogleDriveYouTubePlayer(data)

3
www/js/data.js
View file

@ -217,5 +217,4 @@ function eraseCookie(name) {
/* to be implemented in callbacks.js */
function setupCallbacks() { }
window.enableCyTubeGoogleDriveUserscript = true;
window.enableCyTubeGoogleDriveUserscriptDebug = true;
window.enableCyTubeGoogleDriveUserscriptDebug = getOrDefault("cytube_drive_debug", false);

2
www/js/player.js
View file

@ -1358,7 +1358,7 @@
}
} else if (data.type === 'gd') {
try {
if (data.meta.html5hack) {
if (data.meta.html5hack || window.hasDriveUserscript) {
return window.PLAYER = new window.GoogleDrivePlayer(data);
} else {
return window.PLAYER = new GoogleDriveYouTubePlayer(data);