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

minor cursor improvements and removing unused cieToRgb

Browse source
This commit is contained in:
Egor 2017-12-29 15:11:31 -08:00
parent dc035db886
commit 50218dcc86
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/*global rgbToCie cieToRgb*/ /*global rgbToCie*/
import Ember from 'ember'; import Ember from 'ember';
const { Component, observer, computed, on, run: { later, throttle }, $, isEmpty } = Ember; const { Component, observer, computed, on, run: { later, throttle }, $, isEmpty } = Ember;
@ -195,7 +195,7 @@ export default Component.extend({
syncLight = this.get('syncLight'); syncLight = this.get('syncLight');
if (rgb[0] !== 255 && rgb[1] !== 255 && rgb[2] !== 255) { if (rgb[0] !== 255 && rgb[1] !== 255 && rgb[2] !== 255) {
options['xy'] = this.rgbToXy(rgb[0], rgb[1], rgb[2]); options['xy'] = this.rgbToCie(rgb[0], rgb[1], rgb[2]);
} }
options['transitiontime'] = 0; options['transitiontime'] = 0;

12
web/app/pods/components/lights-tab/template.hbs
View file

@ -1,18 +1,18 @@
{{#paper-list}} {{#paper-list}}
{{#paper-item}} {{#paper-item}}
{{paper-icon "power-settings-new" class=dimmerOnClass}} {{paper-icon "power-settings-new" class=(concat dimmerOnClass " default-cursor")}}
<p data-toggle="tooltip" data-placement="top auto" class="bootstrap-tooltip lights-control-tooltip" data-title="Turn the selected lights on/off">Power</p> <p data-toggle="tooltip" data-placement="top auto" class="bootstrap-tooltip lights-control-tooltip" data-title="Turn the selected lights on/off">Power</p>
{{paper-switch value=lightsOn onChange=(action (mut lightsOn)) disabled=(or trial playing lightsOnDisabled) skipProxy=trial label=lightsOnTxt}} {{paper-switch value=lightsOn onChange=(action (mut lightsOn)) disabled=(or trial playing lightsOnDisabled) skipProxy=trial label=lightsOnTxt}}
{{/paper-item}} {{/paper-item}}
{{#paper-item}} {{#paper-item}}
{{paper-icon "brightness-4" class=dimmerOnClass}} {{paper-icon "brightness-4" class=(concat dimmerOnClass " default-cursor")}}
<p data-toggle="tooltip" data-placement="top auto" class="layout flex-60 bootstrap-tooltip lights-control-tooltip" data-title="The brightness level of the selected lights">Brightness</p> <p data-toggle="tooltip" data-placement="top auto" class="layout flex-60 bootstrap-tooltip lights-control-tooltip" data-title="The brightness level of the selected lights">Brightness</p>
{{paper-slider class="flex" step=10 min=1 max=254 value=lightsBrightness onChange=(action (mut lightsBrightness)) disabled=brightnessControlDisabled}} {{paper-slider class="flex" step=10 min=1 max=254 value=lightsBrightness onChange=(action (mut lightsBrightness)) disabled=brightnessControlDisabled}}
{{/paper-item}} {{/paper-item}}
{{#paper-item elementId="color-row" }} {{#paper-item elementId="color-row" }}
{{paper-icon "color-lens" class=dimmerOnClass}} {{paper-icon "color-lens" class=(concat dimmerOnClass " default-cursor")}}
<p data-toggle="tooltip" data-placement="top auto" class="bootstrap-tooltip lights-control-tooltip" data-title="The color of the selected lights">Color</p> <p data-toggle="tooltip" data-placement="top auto" class="bootstrap-tooltip lights-control-tooltip" data-title="The color of the selected lights">Color</p>
{{#paper-menu offset="0 -50" as |menu|}} {{#paper-menu offset="0 -50" as |menu|}}
@ -30,19 +30,19 @@
{{/paper-item}} {{/paper-item}}
{{#paper-item}} {{#paper-item}}
{{paper-icon "flare" class=dimmerOnClass}} {{paper-icon "flare" class=(concat dimmerOnClass " default-cursor")}}
<p data-toggle="tooltip" data-placement="top auto" class="bootstrap-tooltip lights-control-tooltip" data-title="Selected lights will flash in sequential order">Strobe</p> <p data-toggle="tooltip" data-placement="top auto" class="bootstrap-tooltip lights-control-tooltip" data-title="Selected lights will flash in sequential order">Strobe</p>
{{paper-switch value=strobeOn onChange=(action (mut strobeOn)) disabled=(or trial playing) skipProxy=trial label=strobeOnTxt}} {{paper-switch value=strobeOn onChange=(action (mut strobeOn)) disabled=(or trial playing) skipProxy=trial label=strobeOnTxt}}
{{/paper-item}} {{/paper-item}}
{{#paper-item}} {{#paper-item}}
{{paper-icon "color-lens" class=dimmerOnClass}} {{paper-icon "loop" id="loop-addition" class=dimmerOnClass}} {{paper-icon "color-lens" class=(concat dimmerOnClass " default-cursor")}} {{paper-icon "loop" id="loop-addition" class=dimmerOnClass}}
<p data-toggle="tooltip" data-placement="top auto" class="bootstrap-tooltip lights-control-tooltip" data-title="Selected lights will slowly cycle through all the colors">Colorloop</p> <p data-toggle="tooltip" data-placement="top auto" class="bootstrap-tooltip lights-control-tooltip" data-title="Selected lights will slowly cycle through all the colors">Colorloop</p>
{{paper-switch value=colorLoopOn onChange=(action (mut colorLoopOn)) disabled=(or trial playing) skipProxy=trial label=colorloopOnTxt}} {{paper-switch value=colorLoopOn onChange=(action (mut colorLoopOn)) disabled=(or trial playing) skipProxy=trial label=colorloopOnTxt}}
{{/paper-item}} {{/paper-item}}
{{#paper-item}} {{#paper-item}}
{{paper-icon "shuffle" class=dimmerOnClass}} {{paper-icon "shuffle" class=(concat dimmerOnClass " default-cursor")}}
<p data-toggle="tooltip" data-placement="top auto" class="bootstrap-tooltip lights-control-tooltip" data-title="Randomize the hues (colors) of your selected lights.">Randomize Hues</p> <p data-toggle="tooltip" data-placement="top auto" class="bootstrap-tooltip lights-control-tooltip" data-title="Randomize the hues (colors) of your selected lights.">Randomize Hues</p>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" class="dice" {{action "randomizeHues"}}> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" class="dice" {{action "randomizeHues"}}>

6
web/app/styles/common.scss
View file

@ -16,4 +16,8 @@
.pointer { .pointer {
cursor: pointer; cursor: pointer;
} }
.default-cursor {
cursor: default;
}