Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into add-invidious

This commit is contained in:
Ajay Ramachandran
2020-01-09 19:53:49 -05:00
4 changed files with 20 additions and 7 deletions

1
.gitignore vendored
View File

@@ -3,3 +3,4 @@ ignored
.idea/
node_modules
web-ext-artifacts
.vscode/

View File

@@ -83,6 +83,12 @@
vertical-align: middle;
}
.profilepiccircle {
vertical-align: middle;
overflow: hidden;
border-radius: 50%;
}
a {
text-decoration: underline;
color: inherit;

View File

@@ -78,7 +78,7 @@
<div option-type="toggle" toggle-type="reverse" sync-option="disableAutoSkip">
<label class="switch-container" label-name="__MSG_autoSkip__">
<label class="switch">
<input type="checkbox">
<input type="checkbox" checked>
<span class="slider round"></span>
</label>
</label>
@@ -137,7 +137,7 @@
<div option-type="toggle" toggle-type="reverse" sync-option="hideVideoPlayerControls">
<label class="switch-container" label-name="__MSG_showButtons__">
<label class="switch">
<input type="checkbox">
<input type="checkbox" checked>
<span class="slider round"></span>
</label>
</label>
@@ -154,7 +154,7 @@
<div option-type="toggle" toggle-type="reverse" sync-option="hideInfoButtonPlayerControls">
<label class="switch-container" label-name="__MSG_showInfoButton__">
<label class="switch">
<input type="checkbox">
<input type="checkbox" checked>
<span class="slider round"></span>
</label>
</label>
@@ -171,7 +171,7 @@
<div option-type="toggle" toggle-type="reverse" sync-option="hideDeleteButtonPlayerControls">
<label class="switch-container" label-name="__MSG_showDeleteButton__">
<label class="switch">
<input type="checkbox">
<input type="checkbox" checked>
<span class="slider round"></span>
</label>
</label>
@@ -202,7 +202,7 @@
<br/>
<br/>
<div option-type="text-change" sync-option="userID">
<div option-type="text-change" sync-option="userID" confirm-message="userIDChangeWarning">
<div class="option-button trigger-button">
__MSG_changeUserID__
</div>
@@ -231,7 +231,7 @@
<div option-type="toggle" toggle-type="reverse" sync-option="dontShowNotice">
<label class="switch-container" label-name="__MSG_showSkipNotice__">
<label class="switch">
<input type="checkbox">
<input type="checkbox" checked>
<span class="slider round"></span>
</label>
</label>

View File

@@ -311,7 +311,13 @@ function activateTextChange(element) {
textBox.value = SB.config[option];
let setButton = element.querySelector(".text-change-set");
setButton.addEventListener("click", () => {SB.config[option] = textBox.value});
setButton.addEventListener("click", () => {
let confirmMessage = element.getAttribute("confirm-message");
if (confirmMessage === null || confirm(chrome.i18n.getMessage(confirmMessage))) {
SB.config[option] = textBox.value;
}
});
element.querySelector(".option-hidden-section").classList.remove("hidden");
}