Merge pull request #2169 from raszpl/patch-6

Update active-features.js show themes
code-charity · Apr 9, 2024 · 87aa7e4 · 87aa7e4
2 parents 7014a79 + de836d1
commit 87aa7e4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/menu/satus.js b/menu/satus.js
@@ -3133,7 +3133,7 @@ satus.user.device.connection = function() {
 --------------------------------------------------------------*/
 
 satus.search = function(query, object, callback) {
-	var elements = ['switch', 'select', 'slider', 'shortcut', 'radio', 'color-picker'],
+	var elements = ['switch', 'select', 'slider', 'shortcut', 'radio', 'color-picker', 'label'],
 		threads = 0,
 		results = {},
 		excluded = [

diff --git a/menu/skeleton-parts/active-features.js b/menu/skeleton-parts/active-features.js
@@ -10,15 +10,17 @@ extension.skeleton.header.sectionEnd.menu.on.click.activeFeatures = {
 			variant: 'card',
 			on: {
 				render: function () {
-					var component = this;
+					let component = this;
 
 					satus.search('', extension.skeleton, function (features) {
-						var skeleton = {};
+						let skeleton = {};
 
-						for (var key in features) {
-							var feature = features[key],
+						for (const key in features) {
+							let feature = features[key],
 								default_value = feature.value,
-								value = satus.storage.get(feature.storage || key),
+								value = feature.storage && satus.storage.get(feature.storage)
+									|| feature.radio && satus.storage.get(feature.radio.group) == feature.radio.value
+									|| satus.storage.get(key),
 								parent_object = feature;
 
 							if (!satus.isset(default_value)) {
@@ -40,7 +42,9 @@ extension.skeleton.header.sectionEnd.menu.on.click.activeFeatures = {
 								}
 
 								if (parent_object.parentObject) {
-									var category = parent_object.parentObject.label.text;
+									let category = parent_object.parentObject.label.text,
+										subcategory,
+										text;
 
 									parent_object = feature;
 
@@ -55,15 +59,15 @@ extension.skeleton.header.sectionEnd.menu.on.click.activeFeatures = {
 
 									if (parent_object) {
 										if (parent_object.label) {
-											var subcategory = parent_object.label.text;
+											subcategory = parent_object.label.text;
 										} else {
-											var subcategory = parent_object.text;
+											subcategory = parent_object.text;
 										}
 
 										if (category === subcategory) {
-											var text = satus.locale.get(category);
+											text = satus.locale.get(category);
 										} else {
-											var text = satus.locale.get(category) + ' > ' + satus.locale.get(subcategory);
+											text = satus.locale.get(category) + ' > ' + satus.locale.get(subcategory);
 										}
 
 										if (!skeleton[category + subcategory]) {
@@ -131,4 +135,4 @@ extension.skeleton.header.sectionEnd.menu.on.click.activeFeatures = {
 		component: 'span',
 		text: 'activeFeatures'
 	}
-};
+};