joshpatra/videospeed
1
0
Fork 0
mirror of https://github.com/SoPat712/videospeed.git synced 2025-08-21 18:08:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream

Browse Source 
# Conflicts:
#	inject.js
This commit is contained in:
codebicycle
2018-04-14 13:31:08 +03:00
parent f6a9214cfb 0999acc7fc
commit e0e81ff05e
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
inject.js
View File

@@ -226,7 +226,7 @@ chrome.runtime.sendMessage({}, function(response) {
initializeNow(window.document);
}, false);
if (document && document.doctype && document.doctype.name == "html") {
if (document) {
if (document.readyState === "complete") {
initializeNow(document);
} else {
@@ -241,7 +241,7 @@ chrome.runtime.sendMessage({}, function(response) {
function initializeNow(document) {
// enforce init-once due to redundant callers
if (document.body.classList.contains('vsc-initialized')) {
if (!document.body || document.body.classList.contains('vsc-initialized')) {
return;
}
document.body.classList.add('vsc-initialized');
@@ -380,7 +380,7 @@ chrome.runtime.sendMessage({}, function(response) {
} else if (action === 'slower') {
// Video min rate is 0.0625:
// https://cs.chromium.org/chromium/src/third_party/WebKit/Source/core/html/media/HTMLMediaElement.cpp?l=167
var s = Math.max(v.playbackRate - tc.settings.speedStep, 0.0625);
var s = Math.max(v.playbackRate - tc.settings.speedStep, 0.07);
v.playbackRate = Number(s.toFixed(2));
} else if (action === 'reset') {
resetSpeed(v, 1.0);
@@ -398,7 +398,18 @@ chrome.runtime.sendMessage({}, function(response) {
function resetSpeed(v, target) {
if (v.playbackRate === target) {
v.playbackRate = tc.settings.resetSpeed;
if(v.playbackRate === tc.settings.resetSpeed)
{
if (target !== 1.0) {
v.playbackRate = 1.0;
} else {
v.playbackRate = tc.settings.fastSpeed;
}
}
else
{
v.playbackRate = tc.settings.resetSpeed;
}
} else {
tc.settings.resetSpeed = v.playbackRate;
chrome.storage.local.set({'resetSpeed': v.playbackRate});