Set context on forEach loop, use `this.$` in all places

diff --git a/client/src/applets/settings.js b/client/src/applets/settings.js
index f60b47b83b17eafbb2f34d168b8f1dddf4041bdd..0428d9dd954bcf315650e67cdacc1ddebe1b90e8 100644 (file)
--- a/client/src/applets/settings.js
+++ b/client/src/applets/settings.js
@@ -54,11 +54,9 @@
 \r
         loadSettings: function () {\r
 \r
-            var that = this;\r
+            _.each(_kiwi.global.settings.attributes, function(value, key) {\r
 \r
-            $.each(_kiwi.global.settings.attributes, function(key, value) {\r
-\r
-                var $el = that.$('[data-setting="' + key + '"]');\r
+                var $el = this.$('[data-setting="' + key + '"]');\r
 \r
                 // Only deal with settings we have a UI element for\r
                 if (!$el.length)\r
@@ -69,19 +67,19 @@
                         $el.prop('checked', value);\r
                         break;\r
                     case 'radio':\r
-                        $('[data-setting="' + key + '"][value="' + value + '"]', that.$el).prop('checked', true);\r
+                        this.$('[data-setting="' + key + '"][value="' + value + '"]').prop('checked', true);\r
                         break;\r
                     case 'text':\r
                         $el.val(value);\r
                         break;\r
                     case 'select-one':\r
-                        $('[value="' + value + '"]', that.$el).prop('selected', true);\r
+                        this.$('[value="' + value + '"]').prop('selected', true);\r
                         break;\r
                     default:\r
-                        $('[data-setting="' + key + '"][data-value="' + value + '"]', that.$el).addClass('active');\r
+                        this.$('[data-setting="' + key + '"][data-value="' + value + '"]').addClass('active');\r
                         break;\r
                 }\r
-            });\r
+            }, this);\r
         },\r
 \r
         saveSettings: function (event) {\r