Skip to content

Commit efc9c96

Browse files
tonylu110tonylu110
committed
Fix: feature use not hide
1 parent 2bf04e7 commit efc9c96

File tree

7 files changed

+169
-109
lines changed

7 files changed

+169
-109
lines changed

‎newPage/js/features/backgroud.js

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { elemenetGetId, body, clog } from "../main/function.js";
22

3+
//backgroud setting
34
export function background() {
45
var screenWidth = body().offsetWidth;//get screen width
56
var viewImg = elemenetGetId('viewImg');
@@ -8,6 +9,7 @@ export function background() {
89
var onlinePicUrl = elemenetGetId('onlinePicUrl');
910
var picError = elemenetGetId('picError');
1011

12+
//get img from local
1113
elemenetGetId('backgroundUpload').onchange = function () {
1214
let file = this.files[0];
1315
let reader = new FileReader;
@@ -29,6 +31,7 @@ export function background() {
2931
}
3032
}
3133
}
34+
//get img from online
3235
elemenetGetId('review').onclick = function () {
3336
viewImg.src = onlinePicUrl.value
3437
viewImg.onerror = function () {
@@ -47,12 +50,14 @@ export function background() {
4750
location.reload();
4851
}
4952
}
53+
//to default backgorund img
5054
elemenetGetId('backgroundBefore').onclick = function () {
5155
chrome.storage.local.set({ 'picUrl': '' });
5256
location.reload();
5357
}
5458
}
5559

60+
//to use local img as background
5661
export function loaclImgChange() {
5762
elemenetGetId('background0').onclick = function () {
5863
chrome.storage.local.set({ 'picUrl': "'imgs/background - 0.jpg'" });
@@ -100,6 +105,7 @@ export function loaclImgChange() {
100105
}
101106
}
102107

108+
//use other website's img as background
103109
export function apiImg() {
104110
elemenetGetId('bingImg').onclick = function () {
105111
chrome.storage.local.set({ 'picUrl': "https://api.dujin.org/bing/1920.php" });
@@ -125,6 +131,7 @@ export function apiImg() {
125131
}
126132
}
127133

134+
//load background img in page
128135
export function loadBackground() {
129136
var httpRequest = new XMLHttpRequest();
130137
function picget(url) {

‎newPage/js/features/hsFeature.js

+101-95
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ export function hsFeature() {
151151
}
152152
}
153153
}
154+
154155
export function hsFeatureUse() {
155-
var screenWidth = body().offsetWidth;//get screen width
156156
chrome.storage.local.get(['hideHS', 'historyHS', 'reloadHS', 'calHS', 'timeHS', 'weatherHS', 'downHS', 'infoHS', 'oneHS', 'hs'], function (budget) {
157157
let hideHS = budget.hideHS;
158158
let historyHS = budget.historyHS;
@@ -165,108 +165,114 @@ export function hsFeatureUse() {
165165
let oneHS = budget.oneHS;
166166
var hide = elemenetGetId('hide');
167167
var info = elemenetGetId('info');
168-
if (budget.hs == 'show') {
169-
onHide();
170-
hide.hidden = false; //show hide button
171-
chrome.storage.sync.get(['seaBarHS'], (budget) => {
172-
var seaBarHS = budget.seaBarHS;
173-
if (typeof (seaBarHS) == 'undefined') {
174-
seaBarHS = 'show';
175-
}
176-
if (seaBarHS == 'show') {
177-
elemenetGetId('searchbar').style.display = ""; //show searchBar element
178-
}
179-
})
180-
if (screenWidth <= 813) {
181-
hide.style.marginRight = '0px';
182-
info.hidden = true; //hide info button
183-
}
184-
} else {
185-
onShow();
186-
if (screenWidth <= 813) {
187-
elemenetGetId('history').hidden = true; //hide history button
188-
elemenetGetId('clock').hidden = true; //hide clock button
189-
info.hidden = false; //hide info button
190-
}
191-
if (hideHS == 'hide') {
192-
elemenetGetId('hide').hidden = true;
193-
elemenetGetId('hideHS').className = 'hsFeatureHides';
194-
elemenetGetId('hideHS').innerText = '隐藏';
195-
if (screenWidth <= 813) {
196-
elemenetGetId('reload').style.marginLeft = '0px'
197-
if (elemenetGetId('historyHS').className == 'hsFeatureHides') {
198-
elemenetGetId('cal').style.marginLeft = '0px'
199-
}
200-
}
201-
} else {
202-
elemenetGetId('hide').hidden = false;
168+
let hs = budget.hs;
169+
loadHs(hideHS, historyHS, reloadHS, calHS, timeHS, weatherHS, downHS, infoHS, oneHS, hs, hide, info)
170+
})
171+
}
172+
173+
export function loadHs(hideHS, historyHS, reloadHS, calHS, timeHS, weatherHS, downHS, infoHS, oneHS, hs, hide, info) {
174+
var screenWidth = body().offsetWidth;//get screen width
175+
if (hs == 'show') {
176+
onHide();
177+
hide.hidden = false; //show hide button
178+
chrome.storage.sync.get(['seaBarHS'], (budget) => {
179+
var seaBarHS = budget.seaBarHS;
180+
if (typeof (seaBarHS) == 'undefined') {
181+
seaBarHS = 'show';
203182
}
204-
if (historyHS == 'hide') {
205-
elemenetGetId('history').hidden = true;
206-
elemenetGetId('historyHS').className = 'hsFeatureHides';
207-
elemenetGetId('historyHS').innerText = '隐藏';
208-
} else {
209-
if (screenWidth > 813) {
210-
elemenetGetId('history').hidden = false;
211-
}
183+
if (seaBarHS == 'show') {
184+
elemenetGetId('searchbar').style.display = ""; //show searchBar element
212185
}
213-
if (reloadHS == 'hide') {
214-
elemenetGetId('reload').hidden = true;
215-
elemenetGetId('reloadHS').className = 'hsFeatureHides';
216-
elemenetGetId('reloadHS').innerText = '隐藏';
217-
if (screenWidth <= 813 && elemenetGetId('hideHS').className == 'hsFeatureHides') {
186+
})
187+
if (screenWidth <= 813) {
188+
hide.style.marginRight = '0px';
189+
info.hidden = true; //hide info button
190+
}
191+
} else {
192+
onShow();
193+
if (screenWidth <= 813) {
194+
elemenetGetId('history').hidden = true; //hide history button
195+
elemenetGetId('clock').hidden = true; //hide clock button
196+
info.hidden = false; //hide info button
197+
}
198+
if (hideHS == 'hide') {
199+
elemenetGetId('hide').hidden = true;
200+
elemenetGetId('hideHS').className = 'hsFeatureHides';
201+
elemenetGetId('hideHS').innerText = '隐藏';
202+
if (screenWidth <= 813) {
203+
elemenetGetId('reload').style.marginLeft = '0px'
204+
if (elemenetGetId('historyHS').className == 'hsFeatureHides') {
218205
elemenetGetId('cal').style.marginLeft = '0px'
219206
}
220-
} else {
221-
elemenetGetId('reload').hidden = false;
222-
}
223-
if (calHS == 'hide') {
224-
elemenetGetId('cal').hidden = true;
225-
elemenetGetId('calHS').className = 'hsFeatureHides';
226-
elemenetGetId('calHS').innerText = '隐藏';
227-
} else if (calHS == 'show') {
228-
elemenetGetId('calHS').className = 'hsFeatures';
229-
elemenetGetId('calHS').innerText = '显示';
230-
if (screenWidth <= 813 && elemenetGetId('hideHS').className == 'hsFeatures') {
231-
elemenetGetId('cal').style.marginLeft = '20px'
232-
}
233-
elemenetGetId('cal').hidden = false;
234-
}
235-
if (timeHS == 'hide') {
236-
elemenetGetId('clock').hidden = true;
237-
elemenetGetId('timeHS').className = 'hsFeatureHides';
238-
elemenetGetId('timeHS').innerText = '隐藏';
239-
} else {
240-
if (screenWidth > 813) {
241-
elemenetGetId('clock').hidden = false;
242-
}
243207
}
244-
if (weatherHS == 'hide') {
245-
elemenetGetId('weather').style.display = 'none';
246-
elemenetGetId('weatherHS').className = 'hsFeatureHides';
247-
elemenetGetId('weatherHS').innerText = '隐藏';
248-
} else {
249-
elemenetGetId('weather').style.display = '';
208+
} else {
209+
elemenetGetId('hide').hidden = false;
210+
}
211+
if (historyHS == 'hide') {
212+
elemenetGetId('history').hidden = true;
213+
elemenetGetId('historyHS').className = 'hsFeatureHides';
214+
elemenetGetId('historyHS').innerText = '隐藏';
215+
} else {
216+
if (screenWidth > 813) {
217+
elemenetGetId('history').hidden = false;
250218
}
251-
if (downHS == 'hide') {
252-
elemenetGetId('down').hidden = true;
253-
elemenetGetId('downHS').className = 'hsFeatureHides';
254-
elemenetGetId('downHS').innerText = '隐藏';
255-
} else {
256-
elemenetGetId('down').hidden = false;
219+
}
220+
if (reloadHS == 'hide') {
221+
elemenetGetId('reload').hidden = true;
222+
elemenetGetId('reloadHS').className = 'hsFeatureHides';
223+
elemenetGetId('reloadHS').innerText = '隐藏';
224+
if (screenWidth <= 813 && elemenetGetId('hideHS').className == 'hsFeatureHides') {
225+
elemenetGetId('cal').style.marginLeft = '0px'
257226
}
258-
if (infoHS == 'hide') {
259-
elemenetGetId('info').hidden = true;
260-
elemenetGetId('infoHS').className = 'hsFeatureHides';
261-
elemenetGetId('infoHS').innerText = '隐藏';
262-
} else {
263-
elemenetGetId('info').hidden = false;
227+
} else {
228+
elemenetGetId('reload').hidden = false;
229+
}
230+
if (calHS == 'hide') {
231+
elemenetGetId('cal').hidden = true;
232+
elemenetGetId('calHS').className = 'hsFeatureHides';
233+
elemenetGetId('calHS').innerText = '隐藏';
234+
} else if (calHS == 'show') {
235+
elemenetGetId('calHS').className = 'hsFeatures';
236+
elemenetGetId('calHS').innerText = '显示';
237+
if (screenWidth <= 813 && elemenetGetId('hideHS').className == 'hsFeatures') {
238+
elemenetGetId('cal').style.marginLeft = '20px'
264239
}
265-
if (oneHS == 'hide') {
266-
elemenetGetId('button').style.marginBottom = '-100px';
267-
elemenetGetId('oneHS').className = 'hsFeatureHides';
268-
elemenetGetId('oneHS').innerText = '隐藏';
240+
elemenetGetId('cal').hidden = false;
241+
}
242+
if (timeHS == 'hide') {
243+
elemenetGetId('clock').hidden = true;
244+
elemenetGetId('timeHS').className = 'hsFeatureHides';
245+
elemenetGetId('timeHS').innerText = '隐藏';
246+
} else {
247+
if (screenWidth > 813) {
248+
elemenetGetId('clock').hidden = false;
269249
}
270250
}
271-
})
251+
if (weatherHS == 'hide') {
252+
elemenetGetId('weather').style.display = 'none';
253+
elemenetGetId('weatherHS').className = 'hsFeatureHides';
254+
elemenetGetId('weatherHS').innerText = '隐藏';
255+
} else {
256+
elemenetGetId('weather').style.display = '';
257+
}
258+
if (downHS == 'hide') {
259+
elemenetGetId('down').hidden = true;
260+
elemenetGetId('downHS').className = 'hsFeatureHides';
261+
elemenetGetId('downHS').innerText = '隐藏';
262+
} else {
263+
elemenetGetId('down').hidden = false;
264+
}
265+
if (infoHS == 'hide') {
266+
elemenetGetId('info').hidden = true;
267+
elemenetGetId('infoHS').className = 'hsFeatureHides';
268+
elemenetGetId('infoHS').innerText = '隐藏';
269+
} else {
270+
elemenetGetId('info').hidden = false;
271+
}
272+
if (oneHS == 'hide') {
273+
elemenetGetId('button').style.marginBottom = '-100px';
274+
elemenetGetId('oneHS').className = 'hsFeatureHides';
275+
elemenetGetId('oneHS').innerText = '隐藏';
276+
}
277+
}
272278
}

‎newPage/js/main/dark2light.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { elemenetGetId, elemenetGetClass } from './function.js'
22

3+
//dark mode to change style
34
function dark(alpha) {
45
elemenetGetId('click').style.background = '#000000' + alpha;
56
document.getElementsByTagName('html')[0].className = 'dark';
@@ -29,6 +30,7 @@ function dark(alpha) {
2930
elemenetGetClass('otherBtn')[2].style.display = '';
3031
}
3132

33+
//light mode to change style
3234
function light() {
3335
elemenetGetId('click').style.background = '';
3436
document.getElementsByTagName('html')[0].className = '';
@@ -60,6 +62,7 @@ function light() {
6062
}
6163

6264
export function loadTheme() {
65+
//onload to dark or light mode
6366
chrome.storage.sync.get(['dlMode', 'alphaColor', 'dlAlpha'], function (budget) {
6467
let dlMode = budget.dlMode;
6568
let alphaColor = budget.alphaColor;
@@ -107,6 +110,7 @@ export function loadTheme() {
107110
})
108111
}
109112

113+
//customize the dark or light mode
110114
export function dlUse() {
111115
elemenetGetId('dlAn').onclick = function () {
112116
if (elemenetGetId('dlAn').innerText == '暗色') {

‎newPage/js/main/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { loadTheme, dlUse } from './dark2light.js'
1414
import { getTime, fesUse, otherSettingOnLoad, changeStyle } from './onLoadFeature.js'
1515
import { searchUse, searchOnload, searchChangeUse, showOrHideSearch } from '../features/search.js'
1616

17-
printInfo();
17+
printInfo();//prtint info
1818

1919
window.onload = () => {
2020
loadBackground();

0 commit comments

Comments
 (0)