From 3991d3a7379d7434b92fef5d942851977b13e2d9 Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Wed, 17 Dec 2014 15:19:15 +0100 Subject: [PATCH 1/1] Set context on forEach loop, use `this.$` in all places --- client/src/applets/settings.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/client/src/applets/settings.js b/client/src/applets/settings.js index f60b47b..0428d9d 100644 --- a/client/src/applets/settings.js +++ b/client/src/applets/settings.js @@ -54,11 +54,9 @@ loadSettings: function () { - var that = this; + _.each(_kiwi.global.settings.attributes, function(value, key) { - $.each(_kiwi.global.settings.attributes, function(key, value) { - - var $el = that.$('[data-setting="' + key + '"]'); + var $el = this.$('[data-setting="' + key + '"]'); // Only deal with settings we have a UI element for if (!$el.length) @@ -69,19 +67,19 @@ $el.prop('checked', value); break; case 'radio': - $('[data-setting="' + key + '"][value="' + value + '"]', that.$el).prop('checked', true); + this.$('[data-setting="' + key + '"][value="' + value + '"]').prop('checked', true); break; case 'text': $el.val(value); break; case 'select-one': - $('[value="' + value + '"]', that.$el).prop('selected', true); + this.$('[value="' + value + '"]').prop('selected', true); break; default: - $('[data-setting="' + key + '"][data-value="' + value + '"]', that.$el).addClass('active'); + this.$('[data-setting="' + key + '"][data-value="' + value + '"]').addClass('active'); break; } - }); + }, this); }, saveSettings: function (event) { -- 2.25.1