extern/nightTab
1
0
Fork 0
mirror of https://github.com/zombieFox/nightTab.git synced 2025-06-26 04:21:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

[refactor] improve greeting render

Browse Source
This commit is contained in:
zombieFox 2019-07-15 19:46:58 +01:00
parent c06caf5a36
commit 27b8a41c61
4 changed files with 97 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
src/js/control.js
View File

@ -412,40 +412,40 @@ var control = (function() {
func: function() { func: function() {
render(); render();
dependents(); dependents();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
} }
}, { }, {
element: helper.e(".control-header-greeting-type-good"), element: helper.e(".control-header-greeting-type-good"),
path: "header.greeting.type", path: "header.greeting.type",
type: "radio", type: "radio",
func: function() { func: function() {
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
} }
}, { }, {
element: helper.e(".control-header-greeting-type-hello"), element: helper.e(".control-header-greeting-type-hello"),
path: "header.greeting.type", path: "header.greeting.type",
type: "radio", type: "radio",
func: function() { func: function() {
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
} }
}, { }, {
element: helper.e(".control-header-greeting-type-hi"), element: helper.e(".control-header-greeting-type-hi"),
path: "header.greeting.type", path: "header.greeting.type",
type: "radio", type: "radio",
func: function() { func: function() {
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
} }
}, { }, {
element: helper.e(".control-header-greeting-name"), element: helper.e(".control-header-greeting-name"),
path: "header.greeting.name", path: "header.greeting.name",
type: "text", type: "text",
func: function() { func: function() {
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
} }
}, { }, {
element: helper.e(".control-header-greeting-size"), element: helper.e(".control-header-greeting-size"),
@ -610,8 +610,8 @@ var control = (function() {
dependents(); dependents();
clock.render.clear(); clock.render.clear();
clock.render.all(); clock.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -622,8 +622,8 @@ var control = (function() {
func: function() { func: function() {
clock.render.clear(); clock.render.clear();
clock.render.all(); clock.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -634,8 +634,8 @@ var control = (function() {
func: function() { func: function() {
clock.render.clear(); clock.render.clear();
clock.render.all(); clock.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -648,8 +648,8 @@ var control = (function() {
dependents(); dependents();
clock.render.clear(); clock.render.clear();
clock.render.all(); clock.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -660,8 +660,8 @@ var control = (function() {
func: function() { func: function() {
clock.render.clear(); clock.render.clear();
clock.render.all(); clock.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -672,8 +672,8 @@ var control = (function() {
func: function() { func: function() {
clock.render.clear(); clock.render.clear();
clock.render.all(); clock.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -686,8 +686,8 @@ var control = (function() {
dependents(); dependents();
clock.render.clear(); clock.render.clear();
clock.render.all(); clock.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -698,8 +698,8 @@ var control = (function() {
func: function() { func: function() {
clock.render.clear(); clock.render.clear();
clock.render.all(); clock.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -710,8 +710,8 @@ var control = (function() {
func: function() { func: function() {
clock.render.clear(); clock.render.clear();
clock.render.all(); clock.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -722,8 +722,8 @@ var control = (function() {
func: function() { func: function() {
clock.render.clear(); clock.render.clear();
clock.render.all(); clock.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
} }
}, { }, {
element: helper.e(".control-header-clock-hour24-show"), element: helper.e(".control-header-clock-hour24-show"),
@ -733,8 +733,8 @@ var control = (function() {
dependents(); dependents();
clock.render.clear(); clock.render.clear();
clock.render.all(); clock.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -746,8 +746,8 @@ var control = (function() {
dependents(); dependents();
clock.render.clear(); clock.render.clear();
clock.render.all(); clock.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -824,8 +824,8 @@ var control = (function() {
dependents(); dependents();
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -837,8 +837,8 @@ var control = (function() {
dependents(); dependents();
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -849,8 +849,8 @@ var control = (function() {
func: function() { func: function() {
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -861,8 +861,8 @@ var control = (function() {
func: function() { func: function() {
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -874,8 +874,8 @@ var control = (function() {
dependents(); dependents();
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -886,8 +886,8 @@ var control = (function() {
func: function() { func: function() {
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -898,8 +898,8 @@ var control = (function() {
func: function() { func: function() {
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -912,8 +912,8 @@ var control = (function() {
dependents(); dependents();
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -924,8 +924,8 @@ var control = (function() {
func: function() { func: function() {
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -936,8 +936,8 @@ var control = (function() {
func: function() { func: function() {
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -948,8 +948,8 @@ var control = (function() {
func: function() { func: function() {
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -962,8 +962,8 @@ var control = (function() {
dependents(); dependents();
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -975,8 +975,8 @@ var control = (function() {
dependents(); dependents();
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -987,8 +987,8 @@ var control = (function() {
func: function() { func: function() {
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -1000,8 +1000,8 @@ var control = (function() {
dependents(); dependents();
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -1012,8 +1012,8 @@ var control = (function() {
func: function() { func: function() {
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -1024,8 +1024,8 @@ var control = (function() {
func: function() { func: function() {
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -1038,8 +1038,8 @@ var control = (function() {
dependents(); dependents();
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -1050,8 +1050,8 @@ var control = (function() {
func: function() { func: function() {
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -1062,8 +1062,8 @@ var control = (function() {
func: function() { func: function() {
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -1074,8 +1074,8 @@ var control = (function() {
func: function() { func: function() {
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -1086,8 +1086,8 @@ var control = (function() {
func: function() { func: function() {
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }
@ -1098,8 +1098,8 @@ var control = (function() {
func: function() { func: function() {
date.render.clear(); date.render.clear();
date.render.all(); date.render.all();
greeting.clear(); greeting.render.clear();
greeting.render(); greeting.render.all();
transitional.clear(); transitional.clear();
transitional.render(); transitional.render();
} }

43
src/js/greeting.js
View File

@ -1,21 +1,25 @@
var greeting = (function() { var greeting = (function() {
var bind = function() { var bind = {};
bind.tick = function() {
window.setInterval(function() { window.setInterval(function() {
clear(); render.clear();
render(); render.all();
}, 1000); }, 1000);
}; };
var clear = function() { var render = {};
render.clear = function() {
var greeting = helper.e(".greeting"); var greeting = helper.e(".greeting");
while (greeting.lastChild) { while (greeting.lastChild) {
greeting.removeChild(greeting.lastChild); greeting.removeChild(greeting.lastChild);
}; };
}; };
var render = function() { render.all = function() {
var _greeting = function() { if (state.get().header.greeting.show) {
var greeting = helper.e(".greeting"); var greeting = helper.e(".greeting");
var message = { var message = {
good: function() { good: function() {
@ -34,39 +38,22 @@ var greeting = (function() {
if (state.get().header.greeting.name != "" && state.get().header.greeting.name != undefined) { if (state.get().header.greeting.name != "" && state.get().header.greeting.name != undefined) {
string = string + ", " + state.get().header.greeting.name; string = string + ", " + state.get().header.greeting.name;
}; };
var greetingItem = helper.makeNode({ var greetingItem = helper.node("span|class:greeting-item");
tag: "span", var greetingItemText = helper.node("span:" + string + "|class:greeting-item-text");
attr: [{
key: "class",
value: "greeting-item"
}]
});
var greetingItemText = helper.makeNode({
tag: "span",
text: string,
attr: [{
key: "class",
value: "greeting-item-text"
}]
});
greetingItem.appendChild(greetingItemText); greetingItem.appendChild(greetingItemText);
greeting.appendChild(greetingItem); greeting.appendChild(greetingItem);
}; };
if (state.get().header.greeting.show) {
_greeting();
};
}; };
var init = function() { var init = function() {
bind(); bind.tick();
render(); render.all();
}; };
// exposed methods // exposed methods
return { return {
init: init, init: init,
render: render, render: render
clear: clear
}; };
})(); })();

2
src/js/version.js
View File

@ -1,6 +1,6 @@
var version = (function() { var version = (function() {
var current = "3.37.0"; var current = "3.38.0";
var compare = function(a, b) { var compare = function(a, b) {
var pa = a.split("."); var pa = a.split(".");

2
src/manifest.json
View File

@ -2,7 +2,7 @@
"name": "nightTab", "name": "nightTab",
"short_name": "nightTab", "short_name": "nightTab",
"description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.", "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
"version": "3.37.0", "version": "3.38.0",
"manifest_version": 2, "manifest_version": 2,
"chrome_url_overrides": { "chrome_url_overrides": {
"newtab": "index.html" "newtab": "index.html"