Skip to content

Commit 2fdab72

Browse files
jaedbjaedb
committed
Merge pull request #90 from jaedb/develop
Develop
2 parents f256205 + 8e8d2b2 commit 2fdab72

110 files changed

Lines changed: 12758 additions & 14850 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎mopidy_spotmop/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from services.auth import auth
1212
from mopidy import config, ext
1313

14-
__version__ = '2.6.4'
14+
__version__ = '2.6.5'
1515
__ext_name__ = 'spotmop'
1616
__verbosemode__ = False
1717

‎mopidy_spotmop/static/app.js‎

Lines changed: 313 additions & 84 deletions
Large diffs are not rendered by default.

‎mopidy_spotmop/static/app.min.js‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mopidy_spotmop/static/app/browse/genre/category.template.html‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
<div class="page category-genre-page scrolling-panel">
22
<div class="inner">
33

4-
<div class="page-header mobile-show">
5-
<span class="menu-reveal-trigger" ng-click="showMenu()"><i class="fa fa-bars"></i></span>
6-
<h1 ng-bind="category.name"></h1>
7-
</div>
8-
9-
<h1 class="mobile-hide" ng-bind="category.name"></h1>
4+
<div class="page-header">
5+
6+
<span class="menu-reveal-trigger mobile-show" ng-click="showMenu()"><i class="fa fa-bars"></i></span>
7+
8+
<h1>
9+
<span class="si grid mobile-hide"></span>
10+
<span ng-bind="category.name"></span>
11+
</h1>
12+
13+
</div>
1014

1115
<div class="playlist-items square-panels">
1216

‎mopidy_spotmop/static/app/browse/genre/template.html‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
<div class="page category-page scrolling-panel">
22
<div class="inner">
3-
4-
<div class="page-header mobile-show">
5-
<span class="menu-reveal-trigger" ng-click="showMenu()"><i class="fa fa-bars"></i></span>
6-
<h1>Genre / Category</h1>
7-
</div>
83

9-
<h1 class="mobile-hide">Genre / Category</h1>
4+
<div class="page-header">
5+
6+
<span class="menu-reveal-trigger mobile-show" ng-click="showMenu()"><i class="fa fa-bars"></i></span>
7+
8+
<h1>
9+
<span class="si grid mobile-hide"></span>
10+
Genre / Mood
11+
</h1>
12+
13+
</div>
1014

1115
<div class="category-items square-panels">
1216

‎mopidy_spotmop/static/app/browse/new/template.html‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
<div class="page new-releases-page scrolling-panel">
22
<div class="inner">
33

4-
<div class="page-header mobile-show">
5-
<span class="menu-reveal-trigger" ng-click="showMenu()"><i class="fa fa-bars"></i></span>
6-
<h1>New releases</h1>
7-
</div>
8-
9-
<h1 class="mobile-hide">New releases</h1>
4+
<div class="page-header">
5+
6+
<span class="menu-reveal-trigger mobile-show" ng-click="showMenu()"><i class="fa fa-bars"></i></span>
7+
8+
<h1>
9+
<span class="si leaf mobile-hide"></span>
10+
New releases
11+
</h1>
12+
13+
</div>
1014

1115
<div class="album-items square-panels">
1216

‎mopidy_spotmop/static/app/common/contextmenu/template.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<div>
1+
<div class="contextmenu {{ triggerEvent }}">
22

3-
<div ng-if="isTouchDevice()" class="touch-menu">
3+
<div ng-if="triggerEvent == 'touch'" class="touch-menu">
44
<span class="menu-item" singleclick="play()">
55
<i class="fa fa-play"></i>
66
<span class="text">Play</span>
@@ -35,7 +35,7 @@
3535
</span>
3636
</div>
3737

38-
<div ng-if="!isTouchDevice()" class="non-touch-menu">
38+
<div ng-if="triggerEvent == 'click'" class="non-touch-menu">
3939
<span class="menu-item" singleclick="play()">
4040
Play
4141
</span>
@@ -53,6 +53,9 @@
5353
</span>
5454
<span class="menu-item" ng-show="context != 'localtrack'" singleclick="addToLibrary()">
5555
Add to library
56+
</span>
57+
<span class="menu-item" ng-show="context != 'localtrack'" ngclipboard data-clipboard-text="stuff" ngclipboard-success="copiedToClipboard(e);">
58+
Copy URI(s)
5659
</span>
5760
<span class="menu-item" ng-show="context == 'tltrack'" singleclick="unqueue()">
5861
Delete

‎mopidy_spotmop/static/app/common/mainmenu.template.html‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<ul class="main-menu">
22
<li class="menu-item top-level {{ linkingMode('queue') }}">
33
<a ui-sref="queue">
4-
<i class="si play"></i>
4+
<i class="si play white"></i>
55
Now playing
66
</a>
77
</li>
88
<li class="menu-item top-level {{ linkingMode('search') }} mobile-show">
99
<a ui-sref="search">
10-
<i class="si find"></i>
10+
<i class="si search white"></i>
1111
Search
1212
</a>
1313
</li>
@@ -16,25 +16,25 @@
1616
</li>
1717
<li class="menu-item top-level {{ linkingMode('discover') }}">
1818
<a ui-sref="discover">
19-
<i class="si explore"></i>
19+
<i class="si compass white"></i>
2020
Discover
2121
</a>
2222
</li>
2323
<li class="menu-item {{ linkingMode(['browse.featured','browse.featuredplaylist']) }}">
2424
<a ui-sref="browse.featured">
25-
<i class="si star"></i>
25+
<i class="si star white"></i>
2626
Featured playlists
2727
</a>
2828
</li>
2929
<li class="menu-item {{ linkingMode(['browse.genre','browse.genrecategory','browse.categoryplaylist']) }}">
3030
<a ui-sref="browse.genre">
31-
<i class="si grid"></i>
31+
<i class="si grid white"></i>
3232
Genre / Mood
3333
</a>
3434
</li>
3535
<li class="menu-item {{ linkingMode(['browse.new','browse.newalbum']) }}">
3636
<a ui-sref="browse.new">
37-
<i class="si leaf"></i>
37+
<i class="si leaf white"></i>
3838
New releases
3939
</a>
4040
</li>
@@ -43,38 +43,38 @@
4343
</li>
4444
<li class="menu-item top-level {{ linkingMode('library.albums') }}">
4545
<a ui-sref="library.albums" class="droppable" ng-class="{ unavailable: !spotifyAuthorized }">
46-
<i class="si album"></i>
46+
<i class="si cd white"></i>
4747
Albums
4848
</a>
4949
</li>
5050
<li class="menu-item top-level {{ linkingMode('library.tracks') }}">
5151
<a ui-sref="library.tracks" class="droppable" ng-class="{ unavailable: !spotifyAuthorized }">
52-
<i class="si music"></i>
52+
<i class="si music white"></i>
5353
Tracks
5454
</a>
5555
</li>
5656
<li class="menu-item top-level {{ linkingMode(['library.artists', 'library.artist']) }}">
5757
<a ui-sref="library.artists" class="droppable" ng-class="{ unavailable: !spotifyAuthorized }">
58-
<i class="si mic"></i>
58+
<i class="si mic white"></i>
5959
Artists
6060
</a>
6161
</li>
6262
<li class="menu-item top-level playlists {{ linkingMode(['library.playlists', 'library.playlist']) }}">
6363
<a ui-sref="library.playlists">
64-
<i class="si playlist"></i>
64+
<i class="si playlist white"></i>
6565
Playlists
6666
</a>
6767
</li>
6868
<li class="menu-item top-level {{ linkingMode(['library.files']) }}">
6969
<a ui-sref="library.files({ folder: 'local:directory' })">
70-
<i class="si folder"></i>
70+
<i class="si folder white"></i>
7171
Files
7272
</a>
7373
</li>
7474
<li class="divider spacer"></li>
7575
<li class="menu-item top-level {{ linkingMode('settings') }}">
7676
<a ui-sref="settings">
77-
<i class="si cog"></i>
77+
<i class="si cog white"></i>
7878
Settings
7979
<i class="fa fa-exclamation-triangle red-text services-alert" ng-show="!spotifyOnline || !mopidyOnline"></i>
8080
</a>

‎mopidy_spotmop/static/app/common/slider.template.html‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="controls">
2-
<span class="si invert prev" ng-click="prev()"></span><span class="si invert next" ng-click="next()"></span>
2+
<span class="si chevron-left" ng-click="prev()"></span><span class="si chevron-right next" ng-click="next()"></span>
33
</div>
44
<div class="slides">
55
<div class="slides-content">
@@ -33,6 +33,22 @@
3333
</div>
3434
</div>
3535
</a>
36+
<a ui-sref="browse.playlist({ uri: item.uri })" ng-if="item.type == 'playlist'"
37+
class="square-panel album draggable"
38+
data-id="{{ item.id }}"
39+
draggable="false"
40+
candrag
41+
dragobj="item">
42+
<div class="image-container">
43+
<thumbnail images="item.images"></thumbnail>
44+
</div>
45+
<div class="info animate">
46+
<div class="name" ng-bind="item.name"></div>
47+
<div class="secondary">
48+
<span ng-bind="item.tracks.total"></span> tracks
49+
</div>
50+
</div>
51+
</a>
3652
</div>
3753
</div>
3854
</div>

‎mopidy_spotmop/static/app/common/tracklist/template.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<track ng-if="type == 'track'" ng-repeat="track in tracks track by $index" data-index="{{ $index }}"></track>
2-
<tltrack ng-if="type == 'tltrack'" ng-repeat="track in tracks track by $index" data-index="{{ $index }}"></tltrack>
3-
<localtrack ng-if="type == 'localtrack'" ng-repeat="track in tracks track by $index" data-index="{{ $index }}"></localtrack>
1+
<track ng-if="type == 'track'" ng-repeat="track in tracksWrapper() track by $index" data-index="{{ $index }}"></track>
2+
<tltrack ng-if="type == 'tltrack'" ng-repeat="track in tracksWrapper() track by $index" data-index="{{ $index }}"></tltrack>
3+
<localtrack ng-if="type == 'localtrack'" ng-repeat="track in tracksWrapper() track by $index" data-index="{{ $index }}"></localtrack>
44

5-
<div ng-hide="tracks.length" class="no-items">
5+
<div ng-hide="tracksWrapper().length" class="no-items">
66
No items
77
</div>

0 commit comments

Comments
 (0)