Skip to content

Commit 05808e4

Browse files
committed
[refactor] move default setting values to state module
1 parent 0bdbfee commit 05808e4

21 files changed

+444
-311
lines changed

‎src/js/auto-suggest.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ var autoSuggest = (function(){
88

99
mod.open=function(){
1010
helper.setObject({
11-
object: state.get(),
11+
object: state.get.current(),
1212
path: "autoSuggest",
1313
newValue: true
1414
});
1515
};
1616

1717
mod.close=function(){
1818
helper.setObject({
19-
object: state.get(),
19+
object: state.get.current(),
2020
path: "autoSuggest",
2121
newValue: false
2222
});

‎src/js/background.js‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ var background = (function(){
1515
mod.clear={
1616
file: function(){
1717
helper.setObject({
18-
object: state.get(),
18+
object: state.get.current(),
1919
path: "background.image.file.name",
2020
newValue: ""
2121
});
2222
helper.setObject({
23-
object: state.get(),
23+
object: state.get.current(),
2424
path: "background.image.file.data",
2525
newValue: ""
2626
});
@@ -30,12 +30,12 @@ var background = (function(){
3030
mod.image={
3131
file: function(name,data){
3232
helper.setObject({
33-
object: state.get(),
33+
object: state.get.current(),
3434
path: "background.image.file.name",
3535
newValue: name
3636
});
3737
helper.setObject({
38-
object: state.get(),
38+
object: state.get.current(),
3939
path: "background.image.file.data",
4040
newValue: data
4141
});
@@ -71,7 +71,7 @@ var background = (function(){
7171

7272
render.color={
7373
custom: function(){
74-
helper.e("html").style.setProperty("--background-color-custom",state.get().background.color.custom.r+", "+state.get().background.color.custom.g+", "+state.get().background.color.custom.b);
74+
helper.e("html").style.setProperty("--background-color-custom",state.get.current().background.color.custom.r+", "+state.get.current().background.color.custom.g+", "+state.get.current().background.color.custom.b);
7575
},
7676
clearHTML: function(){
7777
helper.e("html").style.backgroundColor="";
@@ -80,16 +80,16 @@ var background = (function(){
8080

8181
render.image=function(){
8282
varhtml=helper.e("html");
83-
if(state.get().background.image.show){
84-
if(state.get().background.image.from=="file"){
85-
html.style.setProperty("--background-image","url("+state.get().background.image.file.data+")");
86-
}elseif(state.get().background.image.from=="url"){
87-
if(/\s+/g.test(state.get().background.image.url)){
88-
varallUrls=state.get().background.image.url.split(/\s+/);
83+
if(state.get.current().background.image.show){
84+
if(state.get.current().background.image.from=="file"){
85+
html.style.setProperty("--background-image","url("+state.get.current().background.image.file.data+")");
86+
}elseif(state.get.current().background.image.from=="url"){
87+
if(/\s+/g.test(state.get.current().background.image.url)){
88+
varallUrls=state.get.current().background.image.url.split(/\s+/);
8989
varrandomUrl=allUrls[Math.floor(Math.random()*allUrls.length)];
9090
html.style.setProperty("--background-image","url("+randomUrl+")");
9191
}else{
92-
html.style.setProperty("--background-image","url("+state.get().background.image.url+")");
92+
html.style.setProperty("--background-image","url("+state.get.current().background.image.url+")");
9393
};
9494
};
9595
}else{
@@ -99,44 +99,44 @@ var background = (function(){
9999

100100
render.blur=function(){
101101
varhtml=helper.e("html");
102-
html.style.setProperty("--background-blur",state.get().background.image.blur+"px");
102+
html.style.setProperty("--background-blur",state.get.current().background.image.blur+"px");
103103
};
104104

105105
render.grayscale=function(){
106106
varhtml=helper.e("html");
107-
html.style.setProperty("--background-grayscale",state.get().background.image.grayscale);
107+
html.style.setProperty("--background-grayscale",state.get.current().background.image.grayscale);
108108
};
109109

110110
render.opacity=function(){
111111
varhtml=helper.e("html");
112-
html.style.setProperty("--background-opacity",state.get().background.image.opacity);
112+
html.style.setProperty("--background-opacity",state.get.current().background.image.opacity);
113113
};
114114

115115
render.scale=function(){
116116
varhtml=helper.e("html");
117-
html.style.setProperty("--background-scale",state.get().background.image.scale);
117+
html.style.setProperty("--background-scale",state.get.current().background.image.scale);
118118
};
119119

120120
render.accent=function(){
121121
varhtml=helper.e("html");
122-
html.style.setProperty("--background-accent",state.get().background.image.accent);
122+
html.style.setProperty("--background-accent",state.get.current().background.image.accent);
123123
};
124124

125125
render.input={
126126
clear: function(){
127127
helper.e(".control-background-image-file").value="";
128128
},
129129
picker: function(){
130-
helper.e(".control-background-color-custom-current-picker").value=helper.rgbToHex(state.get().background.color.custom);
130+
helper.e(".control-background-color-custom-current-picker").value=helper.rgbToHex(state.get.current().background.color.custom);
131131
},
132132
hex: function(){
133-
helper.e(".control-background-color-custom-current-hex").value=helper.rgbToHex(state.get().background.color.custom);
133+
helper.e(".control-background-color-custom-current-hex").value=helper.rgbToHex(state.get.current().background.color.custom);
134134
}
135135
};
136136

137137
render.feedback={
138138
init: function(){
139-
if(state.get().background.image.file.name!=""){
139+
if(state.get.current().background.image.file.name!=""){
140140
render.feedback.current();
141141
}else{
142142
render.feedback.empty();
@@ -150,7 +150,7 @@ var background = (function(){
150150
current: function(){
151151
varcontrolBackgroundImageFileFeedback=helper.e(".control-background-image-file-feedback");
152152
varpara1=helper.node("p:Image loaded.|class:muted small");
153-
varpara2=helper.node("p:"+state.get().background.image.file.name);
153+
varpara2=helper.node("p:"+state.get.current().background.image.file.name);
154154
controlBackgroundImageFileFeedback.appendChild(para1);
155155
controlBackgroundImageFileFeedback.appendChild(para2);
156156
},

‎src/js/clock.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var clock = (function(){
1919
};
2020

2121
render.all=function(){
22-
if(state.get().header.clock.seconds.show||state.get().header.clock.minutes.show||state.get().header.clock.hours.show){
22+
if(state.get.current().header.clock.seconds.show||state.get.current().header.clock.minutes.show||state.get.current().header.clock.hours.show){
2323
vartimeDateNow=moment();
2424
vartimeStrings={
2525
hours: null,
@@ -31,20 +31,20 @@ var clock = (function(){
3131
hours: {
3232
word: function(){
3333
timeStrings.hours=timeDateNow.hours();
34-
if(!state.get().header.clock.hour24.show&&timeDateNow.hours()>12){
34+
if(!state.get.current().header.clock.hour24.show&&timeDateNow.hours()>12){
3535
timeStrings.hours=timeStrings.hours-12;
3636
};
3737
timeStrings.hours=helper.toWords(timeStrings.hours);
38-
if(state.get().header.clock.hour24.show&&timeDateNow.hours()>0&&timeDateNow.hours()<10){
38+
if(state.get.current().header.clock.hour24.show&&timeDateNow.hours()>0&&timeDateNow.hours()<10){
3939
timeStrings.hours="Zero "+timeStrings.hours;
4040
};
4141
},
4242
number: function(){
4343
timeStrings.hours=timeDateNow.hours();
44-
if(!state.get().header.clock.hour24.show&&timeDateNow.hours()>12){
44+
if(!state.get.current().header.clock.hour24.show&&timeDateNow.hours()>12){
4545
timeStrings.hours=timeStrings.hours-12;
4646
};
47-
if(state.get().header.clock.hour24.show&&timeDateNow.hours()<10){
47+
if(state.get.current().header.clock.hour24.show&&timeDateNow.hours()<10){
4848
timeStrings.hours="0"+timeStrings.hours;
4949
};
5050
}
@@ -81,28 +81,28 @@ var clock = (function(){
8181
timeStrings.meridiem=timeDateNow.format("A");
8282
}
8383
};
84-
action.hours[state.get().header.clock.hours.display]();
85-
action.minutes[state.get().header.clock.minutes.display]();
86-
action.seconds[state.get().header.clock.seconds.display]();
84+
action.hours[state.get.current().header.clock.hours.display]();
85+
action.minutes[state.get.current().header.clock.minutes.display]();
86+
action.seconds[state.get.current().header.clock.seconds.display]();
8787
action.meridiem();
8888
varclock=helper.e(".clock");
8989
varelementHours=helper.node("span:"+timeStrings.hours+"|class:clock-item clock-hours");
9090
varelementMinutes=helper.node("span:"+timeStrings.minutes+"|class:clock-item clock-minutes");
9191
varelementSeconds=helper.node("span:"+timeStrings.seconds+"|class:clock-item clock-seconds");
9292
varelementMeridiem=helper.node("span:"+timeStrings.meridiem+"|class:clock-item clock-meridiem");
93-
if(state.get().header.clock.hours.show){
93+
if(state.get.current().header.clock.hours.show){
9494
clock.appendChild(elementHours);
9595
};
96-
if(state.get().header.clock.minutes.show){
96+
if(state.get.current().header.clock.minutes.show){
9797
clock.appendChild(elementMinutes);
9898
};
99-
if(state.get().header.clock.seconds.show){
99+
if(state.get.current().header.clock.seconds.show){
100100
clock.appendChild(elementSeconds);
101101
};
102-
if(!state.get().header.clock.hour24.show&&state.get().header.clock.meridiem.show){
102+
if(!state.get.current().header.clock.hour24.show&&state.get.current().header.clock.meridiem.show){
103103
clock.appendChild(elementMeridiem);
104104
};
105-
if(state.get().header.clock.separator.show){
105+
if(state.get.current().header.clock.separator.show){
106106
varseparatorCharacter=":";
107107
varparts=clock.querySelectorAll("span");
108108
if(parts.length>1){

0 commit comments

Comments
(0)