From dadd41e8d59dc46e85164076879609b81aa91e20 Mon Sep 17 00:00:00 2001 From: Keegan Date: Tue, 19 Jan 2016 14:13:00 -0800 Subject: [PATCH] fix colors change events --- src/scripts/config-page.js | 9 +++------ src/scripts/lib/items/color.js | 9 ++++----- src/scripts/lib/manipulators.js | 6 ++---- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/scripts/config-page.js b/src/scripts/config-page.js index 3344cec..21a7541 100755 --- a/src/scripts/config-page.js +++ b/src/scripts/config-page.js @@ -64,7 +64,6 @@ function processConfigItem(item, $parent) { $parent.add($container); processConfigItem(item.items, $container); } else { - console.debug('KEEGAN: itemType', item.type); var apiItem = {}; var itemType = itemTypes[item.type]; var templateData = { @@ -74,8 +73,6 @@ function processConfigItem(item, $parent) { size: 4 }; - console.debug('KEEGAN: templateData', templateData); - _.extend(templateData, item); apiItem.$element = HTML(_.formatHtml(itemType.template, templateData)); apiItem.$manipulatorTarget = @@ -89,14 +86,14 @@ function processConfigItem(item, $parent) { // proxy event related methods var eventProxies = {}; apiItem.on = function(events, handler) { - eventProxies[handler] = function(event) { - handler.call(apiItem, event); + eventProxies[handler] = function() { + handler.apply(apiItem, arguments); }; return apiItem.$manipulatorTarget.on(events, eventProxies[handler]); }; apiItem.one = function(events, handler) { eventProxies[handler] = function(event) { - handler.call(apiItem, event); + handler.apply(apiItem, arguments); $.off(eventProxies[handler]); }; return apiItem.$manipulatorTarget.on(events, eventProxies[handler]); diff --git a/src/scripts/lib/items/color.js b/src/scripts/lib/items/color.js index b61cf2b..7c4be8f 100644 --- a/src/scripts/lib/items/color.js +++ b/src/scripts/lib/items/color.js @@ -7,7 +7,6 @@ module.exports = { manipulator: require('../manipulators').val, initialize: function() { var self = this; - console.debug('KEEGAN: initializer', self); /* eslint-disable comma-spacing, no-multi-spaces, max-len, standard/array-bracket-even-spacing */ @@ -72,20 +71,20 @@ module.exports = { $elem.select('.color-box-container').add(HTML(grid)); var $valueDisplay = $elem.select('.value'); - var $picker = $elem.select('.picker-wrap') + var $picker = $elem.select('.picker-wrap'); - $elem.on('click', function(ev) { + $elem.on('|click', function(ev) { $picker.set('show'); }); - self.on('change', function(ev) { + self.on('|change', function() { var value = self.get().replace(/^0x/, '').toLowerCase(); $valueDisplay.set('$background-color', '#' + value); $elem.select('.color-box').set('-selected'); $elem.select('.color-box[data-value="0x' + value + '"]').set('+selected'); }); - $elem.select('.color-box.selectable').on('click', function(ev) { + $elem.select('.color-box.selectable').on('|click', function(ev) { self.set(ev.target.dataset.value); $picker.set('-show'); }); diff --git a/src/scripts/lib/manipulators.js b/src/scripts/lib/manipulators.js index e6be686..fd7b6f6 100755 --- a/src/scripts/lib/manipulators.js +++ b/src/scripts/lib/manipulators.js @@ -19,12 +19,10 @@ module.exports = { .trigger('change'); }, disable: function() { - return this.$manipulatorTarget.set('disabled', true) - .trigger('change'); + return this.$manipulatorTarget.set('disabled', true); }, enable: function() { - return this.$manipulatorTarget.set('disabled', false) - .trigger('change'); + return this.$manipulatorTarget.set('disabled', false); } }, checked: {