Skip to content

Commit 27c7dce

Browse files
jaedbjaedb
committed
Building for release 2.5.4
1 parent 48f66fe commit 27c7dce

12 files changed

Lines changed: 79 additions & 31 deletions

File tree

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
<div>
22

33
<div ng-if="isTouchDevice()">
4-
<span class="menu-item" ng-click="play()">
4+
<span class="menu-item" singleclick="play()">
55
<i class="fa fa-play"></i>
66
<span class="text">Play</span>
77
</span>
8-
<span class="menu-item" ng-click="playNext()" ng-show="context == 'track' || context == 'localtrack'">
8+
<span class="menu-item" singleclick="playNext()" ng-show="context == 'track' || context == 'localtrack'">
99
<i class="fa fa-step-forward"></i>
1010
<span class="text">Play next</span>
1111
</span>
12-
<span class="menu-item" ng-click="enqueue()" ng-show="context == 'track' || context == 'localtrack'">
12+
<span class="menu-item" singleclick="enqueue()" ng-show="context == 'track' || context == 'localtrack'">
1313
<i class="fa fa-plus"></i>
1414
<span class="text">Queue</span>
1515
</span>
16-
<span class="menu-item" ng-click="addToPlaylist()" ng-show="context != 'localtrack'">
16+
<span class="menu-item" singleclick="addToPlaylist()" ng-show="context != 'localtrack'">
1717
<i class="fa fa-plus"></i>
1818
<span class="text">Playlist</span>
1919
</span>
20-
<span class="menu-item" ng-click="addToLibrary()" ng-show="context != 'localtrack'">
20+
<span class="menu-item" singleclick="addToLibrary()" ng-show="context != 'localtrack'">
2121
<i class="fa fa-plus"></i>
2222
<span class="text">Library</span>
2323
</span>
24-
<span class="menu-item" ng-click="removeFromPlaylist()" ng-show="context == 'track'">
24+
<span class="menu-item" singleclick="removeFromPlaylist()" ng-show="context == 'track'">
2525
<i class="fa fa-trash-o"></i>
2626
<span class="text">Delete</span>
2727
</span>
28-
<span class="menu-item" ng-click="unqueue()" ng-show="context == 'tltrack'">
28+
<span class="menu-item" singleclick="unqueue()" ng-show="context == 'tltrack'">
2929
<i class="fa fa-trash-o"></i>
3030
<span class="text">Delete</span>
3131
</span>
32-
<span class="menu-item cancel" ng-click="unselectAll()">
32+
<span class="menu-item cancel" singleclick="unselectAll()">
3333
<i class="fa fa-close"></i>
3434
<span class="text">Cancel</span>
3535
</span>
3636
</div>
3737

3838
<div ng-if="!isTouchDevice()">
39-
<span class="menu-item" ng-click="play()">Play</span>
40-
<span class="menu-item" ng-show="context == 'track' || context == 'localtrack'" ng-click="playNext()">Play next</span>
41-
<span class="menu-item" ng-show="context == 'track' || context == 'localtrack'" ng-click="enqueue()">Add to queue</span>
42-
<span class="menu-item" ng-show="context != 'localtrack'" ng-click="addToPlaylist()">Add to playlist</span>
43-
<span class="menu-item" ng-show="context != 'localtrack'" ng-click="addToLibrary()">Add to library</span>
44-
<span class="menu-item" ng-show="context == 'tltrack'" ng-click="unqueue()">Delete</span>
45-
<span class="menu-item" ng-show="context == 'track'" ng-click="removeFromPlaylist()">Delete</span>
39+
<span class="menu-item" singleclick="play()">Play</span>
40+
<span class="menu-item" ng-show="context == 'track' || context == 'localtrack'" singleclick="playNext()">Play next</span>
41+
<span class="menu-item" ng-show="context == 'track' || context == 'localtrack'" singleclick="enqueue()">Add to queue</span>
42+
<span class="menu-item" ng-show="context != 'localtrack'" singleclick="addToPlaylist()">Add to playlist</span>
43+
<span class="menu-item" ng-show="context != 'localtrack'" singleclick="addToLibrary()">Add to library</span>
44+
<span class="menu-item" ng-show="context == 'tltrack'" singleclick="unqueue()">Delete</span>
45+
<span class="menu-item" ng-show="context == 'track'" singleclick="removeFromPlaylist()">Delete</span>
4646
</div>
4747

4848
</div>

‎mopidy_spotmop/static/app/common/directives.js‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,21 @@ angular.module('spotmop.directives', [])
1818
/* ======================================================================== DIRECTIVES ======== */
1919
/* ============================================================================================ */
2020

21+
/**
22+
* Smarter click
23+
* Fixes issue with ngClick where on touch devices events were triggered twice
24+
* Use exactly the same as ngClick but attribute is "singleclick" instead
25+
**/
26+
.directive('singleclick', function() {
27+
return function(scope, element, attrs) {
28+
element.bind('touchstart click', function(event) {
29+
event.preventDefault();
30+
event.stopPropagation();
31+
scope.$apply(attrs['singleclick']);
32+
});
33+
};
34+
})
35+
2136

2237
/**
2338
* Scrollable panels
@@ -397,6 +412,20 @@ angular.module('spotmop.directives', [])
397412
/* ======================================================================== FILTERS =========== */
398413
/* ============================================================================================ */
399414

415+
416+
// facilitates a filter for null/undefined/false values
417+
.filter('nullOrUndefined', [function () {
418+
return function( items, property ){
419+
var arrayToReturn = [];
420+
for (var i = 0; i < items.length; i++){
421+
if( typeof(items[i][property]) === 'undefined' || items[i][property] == false )
422+
arrayToReturn.push(items[i]);
423+
}
424+
return arrayToReturn;
425+
};
426+
}])
427+
428+
400429
// setup a filter to convert MS to MM:SS
401430
.filter('formatMilliseconds', function() {
402431
return function(ms) {
@@ -408,6 +437,7 @@ angular.module('spotmop.directives', [])
408437
}
409438
})
410439

440+
411441
// get the appropriate sized image
412442
.filter('thumbnailImage', function(){
413443
return function( images ){

‎mopidy_spotmop/static/app/common/tracklist/controller.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,9 +440,9 @@ angular.module('spotmop.common.tracklist', [
440440
selectedTrack.transitioning = false;
441441
});
442442
// successful
443-
}else{
443+
}else{
444444
// remove tracks from DOM
445-
$scope.tracklist.tracks = $filter('filter')( $scope.tracklist.tracks, { selected: false } );
445+
$scope.tracklist.tracks = $filter('nullOrUndefined')( $scope.tracklist.tracks, 'selected' );
446446

447447
// update our snapshot so Spotify knows which version of the playlist our positions refer to
448448
$scope.playlist.snapshot_id = response.snapshot_id;

‎mopidy_spotmop/static/app/services/dialog/addtoplaylist.template.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<h4 class="section-title dialog-title">Select playlist</h4>
44

55
<div class="select-playlist">
6-
<div class="square-panel playlist" ng-repeat="playlist in playlists" ng-click="playlistSelected( playlist )">
6+
<div class="square-panel playlist" ng-repeat="playlist in playlists" singleclick="playlistSelected( playlist )">
77
<div class="image-container">
88
<thumbnail images="playlist.images"></thumbnail>
99
</div>

‎mopidy_spotmop/static/app/services/dialog/initialsetup.template.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ <h4 class="section-title dialog-title">Initial Setup</h4>
66

77
<div class="field text large">
88
<input name="username" placeholder="Your name" ng-model="name" />
9+
<span class="note">This can be changed later in Settings</span>
910
</div>
1011

1112
<div class="actions">

‎mopidy_spotmop/static/app/services/dialog/service.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ angular.module('spotmop.services.dialog', [])
5252
},
5353
controller: function( $scope, $element, DialogService ){
5454

55+
$scope.closeDisabled = false;
56+
if( $scope.type == 'initialsetup' )
57+
$scope.closeDisabled = true;
58+
5559
$scope.closeDialog = function(){
5660
DialogService.remove();
5761
}

‎mopidy_spotmop/static/app/services/dialog/template.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="dialog">
22
<div class="background"></div>
3-
<span class="button close-dialog destructive" ng-click="closeDialog()">
3+
<span class="button close-dialog destructive" ng-click="closeDialog()" ng-hide="closeDisabled">
44
<img src="assets/icons/close-white.svg" class="opacity-hover" />
55
</span>
66
<div class="content">

‎mopidy_spotmop/static/app/settings/template.html‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,9 @@ <h4 class="section-title underline">Spotmop</h4>
5757
<div class="field">
5858
<div class="label">Current version</div>
5959
<div class="input readonly">
60-
<span class="spotmop-version" ng-bind="version.currentVersion"></span>
61-
<span ng-show="version.currentVersion < version.latestVersion">
62-
&nbsp;<a ng-click="upgrade()" ng-show="version.root">Upgrade</a>
63-
<span ng-show="!version.root">Mopidy must be running as root to upgrade</span>
64-
</span>
60+
<span class="spotmop-version" ng-bind="version.currentVersion"></span>
61+
&nbsp;<a ng-click="upgrade()" ng-show="version.root">Check for upgrade</a>
62+
<span ng-show="!version.root">Mopidy must be running as root to upgrade</span>
6563
</div>
6664
<div class="clear-both"></div>
6765
</div>
@@ -122,7 +120,7 @@ <h4 class="section-title underline">
122120
<div class="field">
123121
<div class="label">Country code</div>
124122
<div class="input">
125-
<input type="text" name="spotifycountry" placeholder="NZ" class="autosave" ng-model="settings.spotifycountry" ng-blur="SaveFields( $event )" />
123+
<input type="text" name="countrycode" placeholder="NZ" class="autosave" ng-model="settings.countrycode" ng-blur="SaveFields( $event )" />
126124
<i class="fa fa-check autosave-success"></i>
127125
</div>
128126
</div>
@@ -244,15 +242,16 @@ <h4 class="section-title underline">Advanced</h4>
244242
</div>
245243
</div>
246244

247-
<div class="field">
245+
<div class="field current-connections">
248246
<div class="label">Current connections</div>
249247
<div class="input readonly">
250248
<div ng-repeat="client in clientConnections">
251-
<span class="ip" ng-bind="client.ip"></span>
252-
<span class="name" ng-bind="client.name"></span>
249+
<span class="min-width w100 ip" ng-bind="client.ip"></span>
250+
<span class="min-width w100 name" ng-bind="client.name"></span>
253251
<span class="id grey-text" ng-bind="client.id"></span>
254252
</div>
255253
</div>
254+
<div class="clear-both"></div>
256255
</div>
257256

258257
</div>

‎mopidy_spotmop/static/assets/css/core.css‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,11 @@ body {
186186
.col.w95{ width: 95%; }
187187
.col.w100{ width: 100%; }
188188

189+
.min-width { display: inline-block; }
190+
.min-width.w50 { min-width: 50px; }
191+
.min-width.w100 { min-width: 100px; }
192+
.min-width.w150 { min-width: 150px; }
193+
.min-width.w200 { min-width: 200px; }
189194

190195
.pull-left { float: left; }
191196
.pull-right { float: right; }

‎mopidy_spotmop/static/assets/css/dialog.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@
7070
border-color: #1cf4c4;
7171
}
7272

73-
.dialog .field.text.large input {
73+
.dialog .field.large input {
7474
padding: 10px 0;
7575
font-size: 30px;
76-
width: 50%;
76+
width: 70%;
7777
}
7878

7979
.dialog .field.radio input {

0 commit comments

Comments
 (0)