diff --git a/app/pods/components/color-picker/component.js b/app/pods/components/color-picker/component.js index 8e720d8..b4470e1 100644 --- a/app/pods/components/color-picker/component.js +++ b/app/pods/components/color-picker/component.js @@ -9,6 +9,14 @@ export default Em.Component.extend({ canvasContext: null, actions: { + mouseMove(){ + if(this.get('pressingDown')){ + this.send('colorSelect'); + } + }, + mouseUp(){ + this.set('pressingDown', false); + }, colorSelect() { var canvasOffset = Em.$(this.get('canvas')).offset(); var canvasX = Math.floor(event.pageX - canvasOffset.left), canvasY = Math.floor(event.pageY - canvasOffset.top); @@ -17,12 +25,16 @@ export default Em.Component.extend({ var imageData = this.get('canvasContext').getImageData(canvasX, canvasY, 1, 1); var pixel = imageData.data; + this.set('pressingDown', true); + if( !(pixel[0] === 0 && pixel[1] === 0 && pixel[2] === 0) ) { this.set('rgb', [pixel[0], pixel[1], pixel[2]]); } } }, + pressingDown: false, + // https://dzone.com/articles/creating-your-own-html5 didInsertElement(){ // handle color changes diff --git a/app/pods/components/color-picker/template.hbs b/app/pods/components/color-picker/template.hbs index c9fbfe0..b10307b 100644 --- a/app/pods/components/color-picker/template.hbs +++ b/app/pods/components/color-picker/template.hbs @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/pods/components/groups-list/template.hbs b/app/pods/components/groups-list/template.hbs index 12bd200..a772591 100644 --- a/app/pods/components/groups-list/template.hbs +++ b/app/pods/components/groups-list/template.hbs @@ -1,6 +1,6 @@ {{#paper-list}} {{#paper-item class="newGroupRow"}} -