From 0559e99284ceb2ed10b1e6e9645d7cf3e8759b0e Mon Sep 17 00:00:00 2001 From: lone-cloud Date: Fri, 30 Oct 2015 12:57:18 -0700 Subject: [PATCH] fixes for firefox --- app/index.html | 18 ++++---- app/pods/components/color-picker/component.js | 42 +++++++++---------- app/pods/components/color-picker/template.hbs | 2 +- app/pods/components/lights-tab/component.js | 7 ++-- app/pods/components/music-tab/component.js | 2 +- app/styles/app.scss | 8 +++- 6 files changed, 40 insertions(+), 39 deletions(-) diff --git a/app/index.html b/app/index.html index 5c224a6..eb05cee 100644 --- a/app/index.html +++ b/app/index.html @@ -34,6 +34,13 @@ + + + + {{content-for 'head-footer'}} + + + - - - - - - - - - - {{content-for 'head-footer'}} {{content-for 'body'}} diff --git a/app/pods/components/color-picker/component.js b/app/pods/components/color-picker/component.js index b4470e1..bfcd79b 100644 --- a/app/pods/components/color-picker/component.js +++ b/app/pods/components/color-picker/component.js @@ -1,35 +1,35 @@ import Em from 'ember'; export default Em.Component.extend({ - classNames:['colorpicker'], + classNames: ['colorpicker'], rgb: null, canvas: null, 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); + mouseUp(){ + this.set('pressingDown', false); + }, - // get current pixel - var imageData = this.get('canvasContext').getImageData(canvasX, canvasY, 1, 1); - var pixel = imageData.data; + mouseMove(event){ + if (this.get('pressingDown')) { + this.mouseDown(event); + } + }, - this.set('pressingDown', true); + mouseDown(event){ + var canvasOffset = Em.$(this.get('canvas')).offset(); + var canvasX = Math.floor(event.pageX - canvasOffset.left), canvasY = Math.floor(event.pageY - canvasOffset.top); - if( !(pixel[0] === 0 && pixel[1] === 0 && pixel[2] === 0) ) { - this.set('rgb', [pixel[0], pixel[1], pixel[2]]); - } + // get current pixel + 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]]); } }, @@ -42,7 +42,7 @@ export default Em.Component.extend({ canvasContext = canvas.getContext('2d'), image = new Image(); - image.src ='assets/images/colormap.png'; + image.src = 'assets/images/colormap.png'; image.onload = function () { canvasContext.drawImage(image, 0, 0, image.width, image.height); // draw the image on the canvas }; diff --git a/app/pods/components/color-picker/template.hbs b/app/pods/components/color-picker/template.hbs index b10307b..16508e9 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/lights-tab/component.js b/app/pods/components/lights-tab/component.js index d761a45..b309944 100644 --- a/app/pods/components/lights-tab/component.js +++ b/app/pods/components/lights-tab/component.js @@ -45,12 +45,11 @@ export default Em.Component.extend({ }, didInsertElement() { - var self = this; // TODO figure out how to convert this //this.xyToRgb(0.5,0.5); - Em.$(document).click(function() { - if(self.get('colorPickerDisplayed') && !event.target.classList.contains('color') && !Em.$(event.target).closest('.colorpicker, #colorRow').length) { - self.toggleProperty('colorPickerDisplayed'); + Em.$(document).click((event)=>{ + if(this.get('colorPickerDisplayed') && !event.target.classList.contains('color') && !Em.$(event.target).closest('.colorpicker, #colorRow').length) { + this.toggleProperty('colorPickerDisplayed'); } }); diff --git a/app/pods/components/music-tab/component.js b/app/pods/components/music-tab/component.js index 4c47055..559ae55 100644 --- a/app/pods/components/music-tab/component.js +++ b/app/pods/components/music-tab/component.js @@ -19,7 +19,7 @@ export default Em.Component.extend(helperMixin, visualizerMixin, { this.set('currentVisName', name); }, hideTooltip(){ - Em.$(event.target).parent().parent().find('.tooltip').remove(); + Em.$('.tooltip').remove(); }, gotoSCURL(URL){ // need to pause the music since soundcloud is going to start playing this song anyways diff --git a/app/styles/app.scss b/app/styles/app.scss index 446553e..50c7441 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -916,6 +916,12 @@ body.dimmerOn { .addNewMusic:hover { background: darken($dimmerOnButtonColor, 5%); } + #extraOptionsMenu { + opacity: 0.7; + } + #extraOptionsMenu:hover { + background: rgba(0, 0, 0, 0.9); + } } .power-settings-new.dimmerOn, @@ -1048,7 +1054,7 @@ div.ember-modal-dialog { #extraOptionsMenu:hover { opacity: 1; - background: rgba(0, 0, 0, 0.7); + background: rgba(0, 0, 0, 0.8); } .introjs-helperNumberLayer {