Refactored search

LiminalSoftware · May 28, 2011 · daceb06 · daceb06
1 parent 9d9d4c1
commit daceb06
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 26 deletions.
diff --git a/source/css/main.css b/source/css/main.css
@@ -126,7 +126,7 @@ body.searching #search-result-container {
 }
 
 body.measuring .tab-content, body.measuring #search-result-container {
-    display: block;
+    display: block !important;
     opacity: 0;
     overflow: hidden;
 }
diff --git a/source/js/classes/fancy-settings.js b/source/js/classes/fancy-settings.js
@@ -96,7 +96,6 @@
 
             settings.each(function (setting) {
                 if (setting.params.type !== type) {
-                    console.error("Only one type per group is allowed.");
                     throw "multipleTypes";
                 }
 
@@ -111,8 +110,10 @@
                 if (width < maxWidth) {
                     if (type === "button" || type === "slider") {
                         setting.element.setStyle("margin-left", (maxWidth - width + 2) + "px");
+                        setting.search.element.setStyle("margin-left", (maxWidth - width + 2) + "px");
                     } else {
                         setting.element.setStyle("margin-left", (maxWidth - width) + "px");
+                        setting.search.element.setStyle("margin-left", (maxWidth - width) + "px");
                     }
                 }
             });

diff --git a/source/js/classes/search.js b/source/js/classes/search.js
@@ -14,6 +14,7 @@
 
             this.search = search;
             this.searchResultContainer = searchResultContainer;
+            this.setting = new Setting(new Element("div"));
 
             // Create setting for message "nothing found"
             setting = new Setting(this.searchResultContainer);
@@ -43,40 +44,44 @@
         },
 
         "add": function (setting) {
-            this.index.push(setting);
-        },
-
-        "find": function (searchString) {
-            var result,
-                groupName,
-                group,
-                row,
-                content
+            var searchSetting = this.setting.create(setting.params);
+            setting.search = searchSetting;
+            searchSetting.original = setting;
+            this.index.push(searchSetting);
 
-            // Reset all settings
-            this.index.each(function (setting) {
-                setting.bundle.inject(setting.bundleContainer);
+            setting.addEvent("action", function (value, stopPropagation) {
+                if (searchSetting.set !== undefined && stopPropagation !== true) {
+                    searchSetting.set(value, true);
+                }
             });
-
-            // Hide all groups
-            Object.each(this.groups, function (group) {
-                group.dispose();
+            searchSetting.addEvent("action", function (value) {
+                if (setting.set !== undefined) {
+                    setting.set(value, true);
+                }
+                setting.fireEvent("action", [value, true]);
             });
-
+        },
+
+        "find": function (searchString) {
             // Exit search mode
             if (searchString.trim() === "") {
                 document.body.removeClass("searching");
                 return;
             }
 
             // Or enter search mode
+            this.index.each(function (setting) { setting.bundle.dispose(); });
+            Object.each(this.groups, function (group) { group.dispose(); });
             document.body.addClass("searching");
-            result = this.index.filter(function (setting) {
+
+            // Filter settings
+            var result = this.index.filter(function (setting) {
                 if (setting.params.searchString.contains(searchString.trim().toLowerCase())) {
                     return true;
                 }
             });
 
+            // Display settings
             result.each((function (setting) {
                 var group,
                     row;
@@ -86,9 +91,9 @@
                     this.groups[setting.params.group] = (new Element("table", {
                         "class": "setting group"
                     })).inject(this.searchResultContainer);
-                    group = this.groups[setting.params.group];
 
-                    var row = (new Element("tr")).inject(group);
+                    group = this.groups[setting.params.group];
+                    row = (new Element("tr")).inject(group);
 
                     (new Element("td", {
                         "class": "setting group-name",
@@ -99,8 +104,7 @@
                         "class": "setting group-content"
                     })).inject(row);
                 } else {
-                    group = this.groups[setting.params.group];
-                    group.inject(this.searchResultContainer);
+                    group = this.groups[setting.params.group].inject(this.searchResultContainer);
                 }
 
                 setting.bundle.inject(group.content);

diff --git a/source/js/i18n.js b/source/js/i18n.js
@@ -5,8 +5,12 @@
 //
 (function () {
     var lang = navigator.language.split("-")[0];
-    if (typeOf(this.i18n) !== "object") { this.i18n = {}; }
+    if (this.i18n === undefined) { this.i18n = {}; }
     this.i18n.get = function (value) {
+        if (value === "lang") {
+            return lang;
+        }
+
         if (this.hasOwnProperty(value)) {
             value = this[value];
             if (value.hasOwnProperty(lang)) {
@@ -17,7 +21,7 @@
                 return Object.values(value)[0];
             }
         } else {
-            return undefined;
+            return value;
         }
     };
 }());