From 50218dcc868a24eacc6cd893d2433cfe6bb4e91d Mon Sep 17 00:00:00 2001
From: Egor <hoboman313@gmail.com>
Date: Fri, 29 Dec 2017 15:11:31 -0800
Subject: [PATCH] minor cursor improvements and removing unused cieToRgb

---
 web/app/pods/components/lights-tab/component.js |  4 ++--
 web/app/pods/components/lights-tab/template.hbs | 12 ++++++------
 web/app/styles/common.scss                      |  6 +++++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/web/app/pods/components/lights-tab/component.js b/web/app/pods/components/lights-tab/component.js
index fd70ce6..d69a276 100644
--- a/web/app/pods/components/lights-tab/component.js
+++ b/web/app/pods/components/lights-tab/component.js
@@ -1,4 +1,4 @@
-/*global rgbToCie cieToRgb*/
+/*global rgbToCie*/
 import Ember from 'ember';
 
 const { Component, observer, computed, on, run: { later, throttle }, $, isEmpty } = Ember;
@@ -195,7 +195,7 @@ export default Component.extend({
       syncLight = this.get('syncLight');
 
     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;
diff --git a/web/app/pods/components/lights-tab/template.hbs b/web/app/pods/components/lights-tab/template.hbs
index ccdd79f..c744246 100644
--- a/web/app/pods/components/lights-tab/template.hbs
+++ b/web/app/pods/components/lights-tab/template.hbs
@@ -1,18 +1,18 @@
 {{#paper-list}}
   {{#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>
     {{paper-switch value=lightsOn onChange=(action (mut lightsOn)) disabled=(or trial playing lightsOnDisabled) skipProxy=trial label=lightsOnTxt}}
   {{/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>
     {{paper-slider class="flex" step=10 min=1 max=254 value=lightsBrightness onChange=(action (mut lightsBrightness)) disabled=brightnessControlDisabled}}
   {{/paper-item}}
 
   {{#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>
 
     {{#paper-menu offset="0 -50" as |menu|}}
@@ -30,19 +30,19 @@
   {{/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>
     {{paper-switch value=strobeOn onChange=(action (mut strobeOn)) disabled=(or trial playing) skipProxy=trial label=strobeOnTxt}}
   {{/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>
     {{paper-switch value=colorLoopOn onChange=(action (mut colorLoopOn)) disabled=(or trial playing) skipProxy=trial label=colorloopOnTxt}}
   {{/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>
 
     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" class="dice" {{action "randomizeHues"}}>
diff --git a/web/app/styles/common.scss b/web/app/styles/common.scss
index 955947a..fea4d51 100644
--- a/web/app/styles/common.scss
+++ b/web/app/styles/common.scss
@@ -16,4 +16,8 @@
 
 .pointer {
   cursor: pointer;
-}
\ No newline at end of file
+}
+
+.default-cursor {
+  cursor: default;
+}