Skip to content

Invert page and/or images independently #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
franckspike wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Invert page and/or images independently #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions src/background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,45 @@ function nullFunc() {

function setColors(tabId) {
browser.storage.local.get().then((res) => {
setColorsToState(tabId, res.InvertColorsState, res.ImgColorNoInvert);
setColorsToState(tabId, res.InvertColorsState, res.InvertPage, res.InvertImage);
});
}

function setColorsToState(tabId, state, imgNoInvert) {
function setColorsToState(tabId, state, invertPage, invertImage) {
if (state == true) {
invertColors(tabId);
if (imgNoInvert) invertImg(tabId);
if (invertPage) invertColors(tabId);
if (invertImage != invertPage) invertImg(tabId);
} else {
revertImg(tabId);
revertColors(tabId);
}
browser.sessions.setTabValue(tabId, "invertColors", state).then(nullFunc(), nullFunc());
browser.sessions.setTabValue(tabId, "imgNoInvert", imgNoInvert).then(nullFunc(), nullFunc());
browser.sessions.setTabValue(tabId, "invertPage", invertPage).then(nullFunc(), nullFunc());
browser.sessions.setTabValue(tabId, "invertImage", invertImage).then(nullFunc(), nullFunc());
}

function toggleColors(obj, tab) {
browser.storage.local.get().then((res) => {
if (tab) {
browser.sessions.getTabValue(tab.id, "invertColors").then( tabState => {
tabState = !tabState;
browser.sessions.getTabValue(tab.id, "imgNoInvert").then( imgNoInvert => {
setColorsToState(tab.id, tabState, res.ImgColorNoInvert);
setPageIconState(tab, tabState);
browser.sessions.getTabValue(tab.id, "invertPage").then( invertPage => {
browser.sessions.getTabValue(tab.id, "invertImage").then( invertImage => {
setColorsToState(tab.id, tabState, res.InvertPage, res.InvertImage);
setPageIconState(tab, tabState);
}, nullFunc());
}, nullFunc());
}, nullFunc());
} else {
var state = res.InvertColorsState ? res.InvertColorsState : false;
state = obj != false ? !state : state;
setIconState(state);

browser.storage.local.set({ InvertColorsState: state, ImgColorNoInvert: res.ImgColorNoInvert });
browser.storage.local.set({ InvertColorsState: state, InvertPage: res.InvertPage, InvertImage: res.InvertImage });

browser.tabs.query({}).then((tabs) => {
for (var tab of tabs) {
setColorsToState(tab.id, state, res.ImgColorNoInvert);
setColorsToState(tab.id, state, res.InvertPage, res.InvertImage);
};
});
}
Expand Down Expand Up @@ -99,14 +102,14 @@ function handleUpdated(tabId, changeInfo, tabInfo) {
function handleStorageUpdate(changes, area) {
if (area == "local") {
for (var item of Object.keys(changes)) {
if (item == "InvertColorsState" || item == "ImgColorNoInvert") {
if (item == "InvertColorsState" || item == "InvertPageOnly" || item == "InvertPageAndImage" || item == "InvertImageOnly") {
browser.storage.local.get().then((res) => {
var state = res.InvertColorsState ? res.InvertColorsState : false;
setIconState(state);

browser.tabs.query({}).then((tabs) => {
for (var tab of tabs) {
setColorsToState(tab.id, state, res.ImgColorNoInvert);
setColorsToState(tab.id, state, res.InvertPage, res.InvertImage);
};
});
});
Expand Down
4 changes: 2 additions & 2 deletions src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Invert Colors",
"version": "0.1.6.1",
"author": "Max Badran",
"description": "A simple add-on that inverts the page colors.",
"description": "A simple add-on that inverts page and/or image colors.",
"homepage_url": "https://github.com/Max-Github/FireFoxInvertColors",
"background": {
"scripts": [
Expand Down Expand Up @@ -48,4 +48,4 @@
"contextMenus",
"<all_urls>"
]
}
}
6 changes: 4 additions & 2 deletions src/options.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
<label>Invert Colors State:</label>
<input type="checkbox" id="InvertColorsState"/>
<br/>
<label>Do not invert images:</label>
<input type="checkbox" id="ImgColorNoInvert"/>
<label>What to invert:</label><br>
<input type="radio" name="InvertItems" value="InvertPageOnly">Pages only<br>
<input type="radio" name="InvertItems" value="InvertPageAndImage">Pages and images<br>
<input type="radio" name="InvertItems" value="InvertImageOnly">Images only<br>
<br/>
<button type="submit">Save</button>
</form>
Expand Down
17 changes: 12 additions & 5 deletions src/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@
function loadOptions() {
browser.storage.local.get().then((res) => {
showOption(res.InvertColorsState, res.ImgColorNoInvert);
showOption(res.InvertColorsState, res.InvertPage, res.InvertImage);
});
}

function showOption(state, imgNoInvert) {
function showOption(state, invertPage, invertImage) {
document.querySelector("#InvertColorsState").checked = state;
document.querySelector('#ImgColorNoInvert').checked = imgNoInvert;
if (invertPage && !invertImage || !invertPage && !invertImage)
document.querySelector('input[name=InvertItems]:checked').value = "InvertPageOnly";
if (invertPage && invertImage)
document.querySelector('input[name=InvertItems]:checked').value = "InvertPageAndImage";
if (!invertPage && invertImage)
document.querySelector('input[name=InvertItems]:checked').value = "InvertImageOnly";
}


function updateOptions(e) {
browser.storage.local.set({
InvertColorsState: document.querySelector('#InvertColorsState').checked,
ImgColorNoInvert: document.querySelector('#ImgColorNoInvert').checked
InvertPage: document.querySelector('input[name=InvertItems]:checked').value == "InvertPageAndImage"
|| document.querySelector('input[name=InvertItems]:checked').value == "InvertPageOnly",
InvertImage: document.querySelector('input[name=InvertItems]:checked').value == "InvertPageAndImage"
|| document.querySelector('input[name=InvertItems]:checked').value == "InvertImageOnly"
});

e.preventDefault();
}

Expand Down