CriticalDepsMirror/clay
1
0
Fork 0
mirror of https://github.com/pebble-dev/clay.git synced 2026-08-30 05:46:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix colors change events

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/scripts/lib/items/color.js
+4 -5
View File
@@ -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');
});
src/scripts/lib/manipulators.js
+2 -4
View File
@@ -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: {