fix colors change events

This commit is contained in:
Keegan
2016-01-19 14:13:00 -08:00
parent a3024d49bb
commit dadd41e8d5
3 changed files with 9 additions and 15 deletions
+3 -6
View File
@@ -64,7 +64,6 @@ function processConfigItem(item, $parent) {
$parent.add($container); $parent.add($container);
processConfigItem(item.items, $container); processConfigItem(item.items, $container);
} else { } else {
console.debug('KEEGAN: itemType', item.type);
var apiItem = {}; var apiItem = {};
var itemType = itemTypes[item.type]; var itemType = itemTypes[item.type];
var templateData = { var templateData = {
@@ -74,8 +73,6 @@ function processConfigItem(item, $parent) {
size: 4 size: 4
}; };
console.debug('KEEGAN: templateData', templateData);
_.extend(templateData, item); _.extend(templateData, item);
apiItem.$element = HTML(_.formatHtml(itemType.template, templateData)); apiItem.$element = HTML(_.formatHtml(itemType.template, templateData));
apiItem.$manipulatorTarget = apiItem.$manipulatorTarget =
@@ -89,14 +86,14 @@ function processConfigItem(item, $parent) {
// proxy event related methods // proxy event related methods
var eventProxies = {}; var eventProxies = {};
apiItem.on = function(events, handler) { apiItem.on = function(events, handler) {
eventProxies[handler] = function(event) { eventProxies[handler] = function() {
handler.call(apiItem, event); handler.apply(apiItem, arguments);
}; };
return apiItem.$manipulatorTarget.on(events, eventProxies[handler]); return apiItem.$manipulatorTarget.on(events, eventProxies[handler]);
}; };
apiItem.one = function(events, handler) { apiItem.one = function(events, handler) {
eventProxies[handler] = function(event) { eventProxies[handler] = function(event) {
handler.call(apiItem, event); handler.apply(apiItem, arguments);
$.off(eventProxies[handler]); $.off(eventProxies[handler]);
}; };
return apiItem.$manipulatorTarget.on(events, eventProxies[handler]); return apiItem.$manipulatorTarget.on(events, eventProxies[handler]);
+4 -5
View File
@@ -7,7 +7,6 @@ module.exports = {
manipulator: require('../manipulators').val, manipulator: require('../manipulators').val,
initialize: function() { initialize: function() {
var self = this; var self = this;
console.debug('KEEGAN: initializer', self);
/* eslint-disable comma-spacing, no-multi-spaces, max-len, /* eslint-disable comma-spacing, no-multi-spaces, max-len,
standard/array-bracket-even-spacing */ standard/array-bracket-even-spacing */
@@ -72,20 +71,20 @@ module.exports = {
$elem.select('.color-box-container').add(HTML(grid)); $elem.select('.color-box-container').add(HTML(grid));
var $valueDisplay = $elem.select('.value'); 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'); $picker.set('show');
}); });
self.on('change', function(ev) { self.on('|change', function() {
var value = self.get().replace(/^0x/, '').toLowerCase(); var value = self.get().replace(/^0x/, '').toLowerCase();
$valueDisplay.set('$background-color', '#' + value); $valueDisplay.set('$background-color', '#' + value);
$elem.select('.color-box').set('-selected'); $elem.select('.color-box').set('-selected');
$elem.select('.color-box[data-value="0x' + value + '"]').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); self.set(ev.target.dataset.value);
$picker.set('-show'); $picker.set('-show');
}); });
+2 -4
View File
@@ -19,12 +19,10 @@ module.exports = {
.trigger('change'); .trigger('change');
}, },
disable: function() { disable: function() {
return this.$manipulatorTarget.set('disabled', true) return this.$manipulatorTarget.set('disabled', true);
.trigger('change');
}, },
enable: function() { enable: function() {
return this.$manipulatorTarget.set('disabled', false) return this.$manipulatorTarget.set('disabled', false);
.trigger('change');
} }
}, },
checked: { checked: {