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

ember-collection must come from master commit since they don't release -_-

Browse source
This commit is contained in:
Egor 2017-11-24 14:56:57 -08:00
parent f8293a7373
commit 67d1325c40
4 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -506,8 +506,8 @@ export default Component.extend(helperMixin, visualizerMixin, {
// need to manually remove the tooltip // need to manually remove the tooltip
$('body .tooltip').remove(); $('body .tooltip').remove();
if (index === this.get('playQueuePointer')) { if (this.get('dancer').audio) {
this.send('goToSong', index, true, true); this.clearCurrentAudio(true);
} }
}, },
playerAreaPlay() { playerAreaPlay() {

6
web/app/pods/components/music-tab/template.hbs
View file

@ -96,7 +96,7 @@
{{#ember-collection {{#ember-collection
items=playQueue items=playQueue
cell-layout=(percentage-columns-layout playQueue.length playlistColumns 62) as |item| cell-layout=(percentage-columns-layout playQueue.length playlistColumns 62) as |item index|
}} }}
<div class="playlist-item pointer track{{index}} {{if (eq index playQueuePointer) "active"}} {{if dragging "hidden"}}" {{action "goToSong" index true bubbles=false}}> <div class="playlist-item pointer track{{index}} {{if (eq index playQueuePointer) "active"}} {{if dragging "hidden"}}" {{action "goToSong" index true bubbles=false}}>
{{#if item.picture}} {{#if item.picture}}
@ -109,11 +109,7 @@
{{#if item.title}} {{#if item.title}}
<div class="song-title">{{item.title}}</div> <div class="song-title">{{item.title}}</div>
<div class="song-artist"> <div class="song-artist">
{{#if item.artistUrl}}
<a href="#" {{action "gotoURL" item.artistUrl bubbles=false}}>{{item.artist}}</a>
{{else}}
{{item.artist}} {{item.artist}}
{{/if}}
</div> </div>
{{else}} {{else}}
{{item.fileName}} {{item.fileName}}

2
web/package.json
View file

@ -37,7 +37,7 @@
"ember-cli-shims": "^1.0.2", "ember-cli-shims": "^1.0.2",
"ember-cli-sri": "^2.1.0", "ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^2.0.0", "ember-cli-uglify": "^2.0.0",
"ember-collection": "^1.0.0-alpha.7", "ember-collection": "https://github.com/emberjs/ember-collection",
"ember-export-application-global": "^2.0.0", "ember-export-application-global": "^2.0.0",
"ember-inline-svg": "^0.1.7", "ember-inline-svg": "^0.1.7",
"ember-load-initializers": "^1.0.0", "ember-load-initializers": "^1.0.0",

4
web/yarn.lock
View file

@ -2662,9 +2662,9 @@ ember-cli@^2.14.0:
walk-sync "^0.3.0" walk-sync "^0.3.0"
yam "0.0.22" yam "0.0.22"
ember-collection@^1.0.0-alpha.7: "ember-collection@https://github.com/emberjs/ember-collection":
version "1.0.0-alpha.7" version "1.0.0-alpha.7"
resolved "https://registry.yarnpkg.com/ember-collection/-/ember-collection-1.0.0-alpha.7.tgz#172c2ddaa7d3482fac0781686b434c9c9c42d79a" resolved "https://github.com/emberjs/ember-collection#d2a3565cb7ee32fd09092496ad76b7302c547063"
dependencies: dependencies:
ember-cli-babel "^5.1.5" ember-cli-babel "^5.1.5"
ember-cli-htmlbars "^1.0.1" ember-cli-htmlbars "^1.0.1"