lone-cloud/huegasm
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes for firefox

Browse source
This commit is contained in:
lone-cloud 2015-10-30 12:57:18 -07:00
parent 8980ac3925
commit 0559e99284
6 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/index.html
View file

@ -34,6 +34,13 @@
<meta name="msapplication-config" content="assets/images/favicons/browserconfig.xml"> <meta name="msapplication-config" content="assets/images/favicons/browserconfig.xml">
<meta name="theme-color" content="#ffffff"> <meta name="theme-color" content="#ffffff">
<link rel="stylesheet" integrity="" href="assets/vendor.css">
<link rel="stylesheet" href="assets/huegasm.css">
{{content-for 'head-footer'}}
<script src="https://connect.soundcloud.com/sdk/sdk-3.0.0.js"></script>
<script> <script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@ -42,18 +49,7 @@
ga('create', 'UA-69470561-1', 'auto'); ga('create', 'UA-69470561-1', 'auto');
ga('send', 'pageview'); ga('send', 'pageview');
</script> </script>
<link rel="stylesheet" integrity="" href="assets/vendor.css">
<link rel="stylesheet" href="assets/huegasm.css">
<script src="https://connect.soundcloud.com/sdk/sdk-3.0.0.js"></script>
<!--<script src="//apis.google.com/js/client.js"></script>-->
<!--<script src="//www.youtube.com/iframe_api"></script>-->
{{content-for 'head-footer'}}
</head> </head>
<body> <body>
{{content-for 'body'}} {{content-for 'body'}}

42
app/pods/components/color-picker/component.js
View file

@ -1,35 +1,35 @@
import Em from 'ember'; import Em from 'ember';
export default Em.Component.extend({ export default Em.Component.extend({
classNames:['colorpicker'], classNames: ['colorpicker'],
rgb: null, rgb: null,
canvas: null, canvas: null,
canvasContext: null, canvasContext: null,
actions: { mouseUp(){
mouseMove(){ this.set('pressingDown', false);
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);
// get current pixel mouseMove(event){
var imageData = this.get('canvasContext').getImageData(canvasX, canvasY, 1, 1); if (this.get('pressingDown')) {
var pixel = imageData.data; 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) ) { // get current pixel
this.set('rgb', [pixel[0], pixel[1], pixel[2]]); 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'), canvasContext = canvas.getContext('2d'),
image = new Image(); image = new Image();
image.src ='assets/images/colormap.png'; image.src = 'assets/images/colormap.png';
image.onload = function () { image.onload = function () {
canvasContext.drawImage(image, 0, 0, image.width, image.height); // draw the image on the canvas canvasContext.drawImage(image, 0, 0, image.width, image.height); // draw the image on the canvas
}; };

2
app/pods/components/color-picker/template.hbs
View file

@ -1 +1 @@
<canvas id="picker" width="256" height="256" {{action "colorSelect" on="mouseDown"}} {{action "mouseMove" on="mouseMove"}} {{action "mouseUp" on="mouseUp"}}></canvas> <canvas id="picker" width="256" height="256"></canvas>

7
app/pods/components/lights-tab/component.js
View file

@ -45,12 +45,11 @@ export default Em.Component.extend({
}, },
didInsertElement() { didInsertElement() {
var self = this;
// TODO figure out how to convert this // TODO figure out how to convert this
//this.xyToRgb(0.5,0.5); //this.xyToRgb(0.5,0.5);
Em.$(document).click(function() { Em.$(document).click((event)=>{
if(self.get('colorPickerDisplayed') && !event.target.classList.contains('color') && !Em.$(event.target).closest('.colorpicker, #colorRow').length) { if(this.get('colorPickerDisplayed') && !event.target.classList.contains('color') && !Em.$(event.target).closest('.colorpicker, #colorRow').length) {
self.toggleProperty('colorPickerDisplayed'); this.toggleProperty('colorPickerDisplayed');
} }
}); });

2
app/pods/components/music-tab/component.js
View file

@ -19,7 +19,7 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
this.set('currentVisName', name); this.set('currentVisName', name);
}, },
hideTooltip(){ hideTooltip(){
Em.$(event.target).parent().parent().find('.tooltip').remove(); Em.$('.tooltip').remove();
}, },
gotoSCURL(URL){ gotoSCURL(URL){
// need to pause the music since soundcloud is going to start playing this song anyways // need to pause the music since soundcloud is going to start playing this song anyways

8
app/styles/app.scss
View file

@ -916,6 +916,12 @@ body.dimmerOn {
.addNewMusic:hover { .addNewMusic:hover {
background: darken($dimmerOnButtonColor, 5%); background: darken($dimmerOnButtonColor, 5%);
} }
#extraOptionsMenu {
opacity: 0.7;
}
#extraOptionsMenu:hover {
background: rgba(0, 0, 0, 0.9);
}
} }
.power-settings-new.dimmerOn, .power-settings-new.dimmerOn,
@ -1048,7 +1054,7 @@ div.ember-modal-dialog {
#extraOptionsMenu:hover { #extraOptionsMenu:hover {
opacity: 1; opacity: 1;
background: rgba(0, 0, 0, 0.7); background: rgba(0, 0, 0, 0.8);
} }
.introjs-helperNumberLayer { .introjs-helperNumberLayer {