-
Hue Range
@@ -22,7 +22,7 @@
-
Brightness Range
@@ -32,7 +32,7 @@
-
Sensitivity
diff --git a/chrome/app/styles/light-group.scss b/chrome/app/styles/light-group.scss
index 2cc9735..e906e3b 100644
--- a/chrome/app/styles/light-group.scss
+++ b/chrome/app/styles/light-group.scss
@@ -62,16 +62,13 @@
}
.light-text {
- width: 60px;
- word-wrap: break-word;
padding: 0 7px;
}
.light-text-content {
- display: block; /* Fallback for non-webkit */
- display: -webkit-box;
+ display: block;
overflow: hidden;
text-overflow: ellipsis;
- -webkit-line-clamp: 3;
- -webkit-box-orient: vertical;
+ white-space: nowrap;
+ max-width: 100px;
}
\ No newline at end of file
diff --git a/chrome/public/background.js b/chrome/public/background.js
index 41c6f24..dd2bb3f 100644
--- a/chrome/public/background.js
+++ b/chrome/public/background.js
@@ -178,7 +178,7 @@ chrome.runtime.onMessage.addListener(function (request, sender, sendResponse) {
return true;
});
-// core function that simulates a random light on kick ( beat )
+// core function that simulates a random light on kick (beat)
let simulateKick = (/*mag, ratioKickMag*/) => {
chrome.runtime.sendMessage({ action: 'button-bump' });
diff --git a/mobile/app/pods/components/bridge-finder/template.hbs b/mobile/app/pods/components/bridge-finder/template.hbs
index f54a2ff..dfd68d9 100644
--- a/mobile/app/pods/components/bridge-finder/template.hbs
+++ b/mobile/app/pods/components/bridge-finder/template.hbs
@@ -52,7 +52,7 @@
{{else}}
{{#if bridgeFindFail}}
-
A hue bridge could not be automatically found on your network.
Enter one manually?
( or type offline to look around )
+
A hue bridge could not be automatically found on your network.
Enter one manually?
(or type offline to look around)
diff --git a/mobile/app/pods/components/hue-controls/component.js b/mobile/app/pods/components/hue-controls/component.js
index 6a3e314..55afc40 100644
--- a/mobile/app/pods/components/hue-controls/component.js
+++ b/mobile/app/pods/components/hue-controls/component.js
@@ -173,7 +173,7 @@ export default Component.extend({
},
{
element: '#playlist',
- intro: 'You can add and select music to play from your playlist here. You may listen to local audio files, stream music from soundcloud or stream directly from a connected microphone.
' +
+ intro: 'You can add and select music to play from your playlist here. You may listen to local audio files or stream music from Soundcloud.
' +
'TIP: Songs added through Soundcloud will be saved for when you visit this page again.'
},
{
@@ -182,14 +182,14 @@ export default Component.extend({
},
{
element: '#player-area',
- intro: 'The audio playback may be controlled with the controls here. Basic music visualization effects may be shown here by selecting them from the menu ( eyeball icon in the bottom right ).'
+ intro: 'The audio playback may be controlled with the controls here. Basic music visualization effects may be shown here by selecting them from the menu (eyeball icon in the bottom right).'
},
{
element: '#beat-option-row',
intro: 'These are the settings for the music tab:
' +
- 'Sensitivity - The sensitivity of the beat detector ( more sensitivity results in more registered beats )
' +
+ 'Sensitivity - The sensitivity of the beat detector (more sensitivity results in more registered beats)
' +
'Hue Range - The hue range that the lights may change to on beat.
' +
- 'Brightness Range - The minimum ( off-beat ) and maximum ( on-beat ) brightness of the lights.
' +
+ 'Brightness Range - The minimum (off-beat) and maximum (on-beat) brightness of the lights.
' +
'Flashing Transitions - Quickly flash the lights on beat
' +
'Colorloop - Slowly cycle the lights through all the colors while the music is playing
' +
'TIP: Your sensitivity settings are saved per song as indicated by the red star icon in the top left corner. These settings they will be restored if you ever listen to the same song again.',
diff --git a/mobile/app/pods/components/lights-tab/component.js b/mobile/app/pods/components/lights-tab/component.js
index 682c1a5..3642a95 100644
--- a/mobile/app/pods/components/lights-tab/component.js
+++ b/mobile/app/pods/components/lights-tab/component.js
@@ -53,7 +53,7 @@ export default Component.extend({
return lightsData[light].state.effect === 'colorloop';
});
- // if the internal lights state is different than the one from lightsData ( user manually toggled the switch ), send the request to change the bulbs state
+ // if the internal lights state is different than the one from lightsData (user manually toggled the switch), send the request to change the bulbs state
if (colorLoopsOn !== colorLoopsOnSystem) {
activeLights.forEach((light) => {
if (this.get('lightsData')[light].state.effect !== effect) {
@@ -105,7 +105,7 @@ export default Component.extend({
return lightsData[light].state.on === true;
});
- // if the internal lights state is different than the one from lightsData ( user manually toggled the switch ), send the request to change the bulbs state
+ // if the internal lights state is different than the one from lightsData (user manually toggled the switch), send the request to change the bulbs state
if (lightsOn !== lightsOnSystem) {
activeLights.forEach((light) => {
$.ajax(this.get('apiURL') + '/lights/' + light + '/state', {
@@ -130,7 +130,7 @@ export default Component.extend({
lightsBrightnessSystem /= activeLights.length;
- // if the internal lights state is different than the one from lightsData ( user manually toggled the switch ), send the request to change the bulbs state
+ // if the internal lights state is different than the one from lightsData (user manually toggled the switch), send the request to change the bulbs state
if (lightsBrightness !== lightsBrightnessSystem) {
activeLights.forEach((light) => {
$.ajax(this.get('apiURL') + '/lights/' + light + '/state', {
diff --git a/mobile/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs b/mobile/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs
index 21a2a86..788dd21 100644
--- a/mobile/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs
+++ b/mobile/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs
@@ -2,7 +2,7 @@
{{#modal-dialog close="close" alignment="center" translucentOverlay=true attachment="center" targetAttachment="center"}}
Enter a SoundCloud track or playlist/set URL
- ( ex. https://soundcloud.com/mrsuicidesheep/tracks )
+ (ex. https://soundcloud.com/mrsuicidesheep/tracks)
{{paper-input label="SoundCloud URL" icon="search" value=url onChange=(action (mut url))}}
diff --git a/mobile/app/pods/components/music-tab/mixins/helpers.js b/mobile/app/pods/components/music-tab/mixins/helpers.js
index 95214f4..90ad01e 100644
--- a/mobile/app/pods/components/music-tab/mixins/helpers.js
+++ b/mobile/app/pods/components/music-tab/mixins/helpers.js
@@ -149,13 +149,13 @@ export default Mixin.create({
return html;
},
urlNotFoundHtml(url) {
- return 'The URL ( ' + url + ' ) could not be resolved.
';
+ return 'The URL (' + url + ') could not be resolved.
';
},
failedToPlayFileHtml(fileName) {
- return 'Failed to play file ( ' + fileName + ' ).
';
+ return 'Failed to play file (' + fileName + ').
';
},
failedToDecodeFileHtml(fileName) {
- return 'Failed to decode file ( ' + fileName + ' ).
';
+ return 'Failed to decode file (' + fileName + ').
';
},
scUrl: computed('playQueuePointer', 'playQueue.[]', function () {
diff --git a/mobile/app/pods/components/music-tab/template.hbs b/mobile/app/pods/components/music-tab/template.hbs
index 4ef92da..326769b 100644
--- a/mobile/app/pods/components/music-tab/template.hbs
+++ b/mobile/app/pods/components/music-tab/template.hbs
@@ -136,7 +136,7 @@
-
+
Brightness Range
diff --git a/mobile/app/styles/light-group.scss b/mobile/app/styles/light-group.scss
index 8ed24c6..acccb70 100644
--- a/mobile/app/styles/light-group.scss
+++ b/mobile/app/styles/light-group.scss
@@ -55,8 +55,6 @@
}
.light-text {
- width: 60px;
- word-wrap: break-word;
padding: 0 7px;
&.light-inactive::before {
left: 10px;
@@ -65,9 +63,8 @@
.light-text-content {
display: block;
- display: -webkit-box;
overflow: hidden;
text-overflow: ellipsis;
- -webkit-line-clamp: 3;
- -webkit-box-orient: vertical;
+ white-space: nowrap;
+ max-width: 100px;
}
\ No newline at end of file
diff --git a/web/app/pods/components/bridge-finder/template.hbs b/web/app/pods/components/bridge-finder/template.hbs
index 913063a..648b898 100644
--- a/web/app/pods/components/bridge-finder/template.hbs
+++ b/web/app/pods/components/bridge-finder/template.hbs
@@ -53,7 +53,7 @@
{{else}}
{{#if bridgeFindFail}}
-
A hue bridge could not be automatically found on your network.
Enter one manually?
( or type offline to look around )
+
A hue bridge could not be automatically found on your network.
Enter one manually?
(or type offline to look around)
diff --git a/web/app/pods/components/hue-controls/component.js b/web/app/pods/components/hue-controls/component.js
index 92afcba..74e8ecd 100644
--- a/web/app/pods/components/hue-controls/component.js
+++ b/web/app/pods/components/hue-controls/component.js
@@ -158,7 +158,7 @@ export default Component.extend({
},
{
element: '#playlist',
- intro: 'You can add and select music to play from your playlist here. You may listen to local audio files, stream music from soundcloud or stream directly from a connected microphone.
' +
+ intro: 'You can add and select music to play from your playlist here. You may listen to local audio files or stream music from Soundcloud.
' +
'TIP: Songs added through Soundcloud will be saved for when you visit this page again.'
},
{
@@ -167,14 +167,14 @@ export default Component.extend({
},
{
element: '#player-area',
- intro: 'The audio playback may be controlled with the controls here. Basic music visualization effects may be shown here by selecting them from the menu ( eyeball icon in the bottom right ).'
+ intro: 'The audio playback may be controlled with the controls here. Basic music visualization effects may be shown here by selecting them from the menu (eyeball icon in the bottom right).'
},
{
element: '#beat-option-row',
intro: 'These are the settings for the music tab:
' +
- 'Sensitivity - The sensitivity of the beat detector ( more sensitivity results in more registered beats )
' +
+ 'Sensitivity - The sensitivity of the beat detector (more sensitivity results in more registered beats)
' +
'Hue Range - The hue range that the lights may change to on beat.
' +
- 'Brightness Range - The minimum ( off-beat ) and maximum ( on-beat ) brightness of the lights.
' +
+ 'Brightness Range - The minimum (off-beat) and maximum (on-beat) brightness of the lights.
' +
'Flashing Transitions - Quickly flash the lights on beat
' +
'Colorloop - Slowly cycle the lights through all the colors while the music is playing
' +
'TIP: Your sensitivity settings are saved per song as indicated by the red star icon in the top left corner. These settings they will be restored if you ever listen to the same song again.',
diff --git a/web/app/pods/components/lights-tab/component.js b/web/app/pods/components/lights-tab/component.js
index 5086f2c..875c30f 100644
--- a/web/app/pods/components/lights-tab/component.js
+++ b/web/app/pods/components/lights-tab/component.js
@@ -54,7 +54,7 @@ export default Component.extend({
return lightsData[light].state.effect === 'colorloop';
});
- // if the internal lights state is different than the one from lightsData ( user manually toggled the switch ), send the request to change the bulbs state
+ // if the internal lights state is different than the one from lightsData (user manually toggled the switch), send the request to change the bulbs state
if (colorLoopsOn !== colorLoopsOnSystem) {
activeLights.forEach((light) => {
if (this.get('lightsData')[light].state.effect !== effect) {
@@ -106,7 +106,7 @@ export default Component.extend({
return lightsData[light].state.on === true;
});
- // if the internal lights state is different than the one from lightsData ( user manually toggled the switch ), send the request to change the bulbs state
+ // if the internal lights state is different than the one from lightsData (user manually toggled the switch), send the request to change the bulbs state
if (lightsOn !== lightsOnSystem) {
activeLights.forEach((light) => {
$.ajax(this.get('apiURL') + '/lights/' + light + '/state', {
@@ -131,7 +131,7 @@ export default Component.extend({
lightsBrightnessSystem /= activeLights.length;
- // if the internal lights state is different than the one from lightsData ( user manually toggled the switch ), send the request to change the bulbs state
+ // if the internal lights state is different than the one from lightsData (user manually toggled the switch), send the request to change the bulbs state
if (lightsBrightness !== lightsBrightnessSystem) {
activeLights.forEach((light) => {
$.ajax(this.get('apiURL') + '/lights/' + light + '/state', {
diff --git a/web/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs b/web/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs
index d889152..7a639b4 100644
--- a/web/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs
+++ b/web/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs
@@ -2,7 +2,7 @@
{{#modal-dialog close="close" alignment="center" translucentOverlay=true attachment="center" targetAttachment="center"}}
Enter a SoundCloud track or playlist/set URL
- ( ex. https://soundcloud.com/mrsuicidesheep/tracks )
+ (ex. https://soundcloud.com/mrsuicidesheep/tracks)
{{paper-input label="SoundCloud URL" icon="search" value=url onChange=(action (mut url))}}
diff --git a/web/app/pods/components/music-tab/component.js b/web/app/pods/components/music-tab/component.js
index 35025c1..b3c4167 100644
--- a/web/app/pods/components/music-tab/component.js
+++ b/web/app/pods/components/music-tab/component.js
@@ -111,7 +111,7 @@ export default Component.extend(helperMixin, visualizerMixin, {
},
dragLeave() {
- // need to delay the dragLeave notification to avoid flickering ( hovering over some page elements causes this event to be sent )
+ // need to delay the dragLeave notification to avoid flickering (hovering over some page elements causes this event to be sent)
this.set('dragLeaveTimeoutHandle', setTimeout(() => { this.set('dragging', false); }, 500));
},
diff --git a/web/app/pods/components/music-tab/mixins/helpers.js b/web/app/pods/components/music-tab/mixins/helpers.js
index b440cb8..0d0dae0 100644
--- a/web/app/pods/components/music-tab/mixins/helpers.js
+++ b/web/app/pods/components/music-tab/mixins/helpers.js
@@ -152,13 +152,13 @@ export default Mixin.create({
return html;
},
urlNotFoundHtml(url) {
- return 'The URL ( ' + url + ' ) could not be resolved.
';
+ return 'The URL (' + url + ') could not be resolved.
';
},
failedToPlayFileHtml(fileName) {
- return 'Failed to play file ( ' + fileName + ' ).
';
+ return 'Failed to play file (' + fileName + ').
';
},
failedToDecodeFileHtml(fileName) {
- return 'Failed to decode file ( ' + fileName + ' ).
';
+ return 'Failed to decode file (' + fileName + ').
';
},
scUrl: computed('playQueuePointer', 'playQueue.[]', function () {
diff --git a/web/app/pods/components/music-tab/template.hbs b/web/app/pods/components/music-tab/template.hbs
index ee8a409..b15ab85 100644
--- a/web/app/pods/components/music-tab/template.hbs
+++ b/web/app/pods/components/music-tab/template.hbs
@@ -142,7 +142,7 @@
-
Hue Range
@@ -152,7 +152,7 @@
-
Brightness Range
@@ -162,7 +162,7 @@
-
Sensitivity
diff --git a/web/app/styles/light-group.scss b/web/app/styles/light-group.scss
index a7a1a90..c7fbc6e 100644
--- a/web/app/styles/light-group.scss
+++ b/web/app/styles/light-group.scss
@@ -63,16 +63,13 @@
}
.light-text {
- width: 60px;
- word-wrap: break-word;
padding: 0 7px;
}
.light-text-content {
- display: block; /* Fallback for non-webkit */
- display: -webkit-box;
+ display: block;
overflow: hidden;
text-overflow: ellipsis;
- -webkit-line-clamp: 3;
- -webkit-box-orient: vertical;
+ white-space: nowrap;
+ max-width: 100px;
}
\ No newline at end of file
diff --git a/web/package.json b/web/package.json
index cfc4e06..3710808 100644
--- a/web/package.json
+++ b/web/package.json
@@ -19,7 +19,7 @@
"devDependencies": {
"broccoli-asset-rev": "^2.2.0",
"ember-cli": "^2.8.0",
- "ember-cli-app-version": "^2.0.0",
+ "ember-cli-app-version": "^3.0.0",
"ember-cli-babel": "^5.1.5",
"ember-cli-dependency-checker": "^1.2.0",
"ember-cli-htmlbars": "^1.0.1",
@@ -30,15 +30,14 @@
"ember-cli-sass": "^6.0.0",
"ember-cli-shims": "^1.0.2",
"ember-cli-sri": "^2.1.0",
- "ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
- "ember-export-application-global": "^1.0.4",
+ "ember-export-application-global": "^2.0.0",
"ember-inline-svg": "^0.1.7",
- "ember-load-initializers": "^0.6.3",
+ "ember-load-initializers": "^1.0.0",
"ember-modal-dialog": "^0.9.0",
"ember-notify": "^5.0.4",
- "ember-paper": "git+https://github.com/miguelcobain/ember-paper.git",
- "ember-resolver": "^3.0.0",
+ "ember-paper": "^1.0.0-alpha.19",
+ "ember-resolver": "^4.0.0",
"ember-source": "^2.11.0",
"ember-truth-helpers": "^1.2.0",
"loader.js": "^4.0.7"