Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: "Checkout Jamstash"
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
# Need the gh-pages branch to be available
fetch-depth: 0
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:

- name: Upload artifact
if: "!startsWith(github.ref, 'refs/tags/')"
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Jamstash-${{ steps.get_sha.outputs.SHA }}
path: ./jamstash.zip
Expand Down
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
images/Thumbs.db
bower_components
dist
#dist
node_modules
/.tmp
/.ssh
/coverage
package-lock.json
yarn.lock
.yarn
.tmp


2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nodeLinker: node-modules

Binary file modified app/images/albumdefault_120.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/albumdefault_160.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/albumdefault_25.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/albumdefault_50.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/albumdefault_56.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/albumdefault_60.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/aperture_gd_12x12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/archive_gd_16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/arrow_down_8x8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/arrow_left_gl_12x12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/arrow_right_gl_12x12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/arrow_right_gl_8x8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/chat_alt_stroke_12x12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/cog_16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/comment_stroke_12x11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/comment_stroke_gl_12x11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/download_gd_9x12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/download_gl_9x12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/fbpreview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/first_12x12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/first_24x24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/first_32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/fork_gd_11x12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/headphones_gd_16x14.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/last_12x12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/images/last_24x24.png
Binary file modified app/images/last_32x32.png
Binary file modified app/images/lock_stroke_gl_9x12.png
Binary file modified app/images/loop_alt1_gd_12x9.png
Binary file modified app/images/magnifying_glass_alt_12x12.png
Binary file modified app/images/movie_gd_16x16.png
Binary file modified app/images/pause_24x32.png
Binary file modified app/images/pin_gl_12x12.png
Binary file modified app/images/play_12x16.png
Binary file modified app/images/play_24x32.png
Binary file modified app/images/play_alt_8x8.png
Binary file modified app/images/play_alt_gd_16x16.png
Binary file modified app/images/rss_12x12.png
Binary file modified app/images/rss_16x16.png
Binary file modified app/images/star_lgo_12x12.png
Binary file modified app/images/star_wo_12x12.png
Binary file modified app/images/star_yo_12x12.png
Binary file modified app/images/steering_wheel_gd_12x12.png
Binary file modified app/images/steering_wheel_gd_16x16.png
Binary file modified app/images/subsonic_36.png
Binary file modified app/images/subsonic_48x48.png
Binary file modified app/images/subsonic_dn_36.png
Binary file modified app/images/volume_gd_12x9.png
Binary file modified app/images/volume_gl_12x9.png
Binary file modified app/images/volume_mute_gd_12x9.png
Binary file modified app/images/volume_mute_gl_12x9.png
Binary file modified app/images/volume_mute_w_12x9.png
Binary file modified app/images/volume_w_12x9.png
Binary file modified app/images/x_11x11.png
Binary file modified app/images/x_gl_11x11.png
5 changes: 3 additions & 2 deletions app/player/player-directive.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,14 @@ angular.module('jamstash.player.directive', ['jamstash.player.service', 'jamstas
scope.fancyboxOpenImage(newSong.coverartfull);
}
var media = {};
if (['oga', 'm4a', 'mp3', 'flac'].indexOf(newSong.suffix) > -1) {
if (['oga', 'm4a', 'mp3', 'flac'].includes(newSong.suffix)) {
media[newSong.suffix] = newSong.url;
media['duration'] = newSong.duration;
}
$player.jPlayer('setMedia', media);
$player.jPlayer('mute', false);
if (globals.settings.Jukebox) {
$player.jPlayer('mute', true);
//$player.jPlayer('mute', true);
subsonic.addToJukebox(newSong);
}
if (playerService.loadSong === true || globals.settings.Jukebox) {
Expand Down
2 changes: 1 addition & 1 deletion app/settings/settings-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ angular.module('jamstash.settings.service', [])
DefaultAlbumSort: this.AlbumSorts[0],
DefaultArchiveAlbumSort: "date desc",
Jukebox: false,
AutoPlay: false,
AutoPlay: true,
LoopQueue: false,
Repeat: false,
// Advanced
Expand Down
4 changes: 2 additions & 2 deletions app/styles/Dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ a.button {
}
a.button:hover {
color: #939393;
-moz-box-shadow: 0 2px 0 rgba(242, 242, 242, 0.2)
-moz-box-shadow: 0 2px 0 rgba(242, 242, 242, 0.2);
-webkit-box-shadow:0 2px 5px rgba(242, 242, 242, 0.2);
box-shadow: 0 1px 2px rgba(242, 242, 242, 0.15);
border-color: #5a5a5a;
Expand All @@ -171,7 +171,7 @@ a.button:active {
a.selected {
color: #939393;
border-color: #5a5a5a;
-moz-box-shadow: 0 2px 0 rgba(242, 242, 242, 0.2)
-moz-box-shadow: 0 2px 0 rgba(242, 242, 242, 0.2);
-webkit-box-shadow:0 2px 5px rgba(242, 242, 242, 0.2);
box-shadow: 0 1px 2px rgba(242, 242, 242, 0.15);
background: #161616;
Expand Down
2 changes: 1 addition & 1 deletion app/styles/Mobile.css
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
.smcolumn {
width: 75%;
background: rgba(255, 255, 255, 0.8);
border-bottom; none;
border-bottom: none;
min-width: 292px;
top: 120px;
margin-bottom: -122px;
Expand Down
10 changes: 8 additions & 2 deletions app/styles/Style.css
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,8 @@ ul.actionlist li
#AutoAlbumContainer a.nextprev
{
padding: 4px;
font-weight:bold !important;
color:#000;
}
#AutoAlbumContainer a.nextprev:hover
{
Expand Down Expand Up @@ -1068,6 +1070,8 @@ ul.songlist li:hover
padding: 5px 10px;
margin: 2px 0 0 1px;
z-index:999;
height: 70%;
overflow-y: scroll;
}
.submenu a
{
Expand Down Expand Up @@ -1570,7 +1574,8 @@ a.button {
a.button:hover {
color: #333;
border-color: #999;
-moz-box-shadow: 0 2px 0 rgba(0, 0, 0, 0.2) -webkit-box-shadow:0 2px 5px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 2px 0 rgba(0, 0, 0, 0.2);
-webkit-box-shadow:0 2px 5px rgba(0, 0, 0, 0.2);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15);
}
a.button:active {
Expand All @@ -1597,7 +1602,8 @@ a.blockbutton {
a.selected {
color: #333;
border-color: #999;
-moz-box-shadow: 0 2px 0 rgba(0, 0, 0, 0.2) -webkit-box-shadow:0 2px 5px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 2px 0 rgba(0, 0, 0, 0.2);
-webkit-box-shadow:0 2px 5px rgba(0, 0, 0, 0.2);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15);
background: #fdfdfd;
background: -webkit-gradient(linear,0% 40%,0% 70%,from(#ffffff),to(#fdfdfd));
Expand Down
2 changes: 2 additions & 0 deletions app/subsonic/subsonic.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
<div class="subactions">
<div class="floatleft" ng-show="selectedPlaylist !== null">
<label>Playlist Actions</label>
<a href="" class="button" id="action_ExportPlaylist" title="Export Selected Playlist" ng-click="exportPlaylist()">Export</a>
<a href="" class="button" id="action_DownloadPlaylist" title="Download Selected Playlist" ng-click="downloadPlaylist()">Download</a>
<a href="" class="button" id="action_DeletePlaylist" title="Delete Selected Playlist" ng-click="deletePlaylist()">Delete</a>
<a href="" class="button" id="action_SavePlaylist" title="Save Playlist" ng-click="savePlaylist()">Save</a>
<a href="" class="button" id="action_RemoveSongs" title="Remove selected song(s) from playlist" ng-click="songsRemoveSelected()">Remove Song(s)</a>
Expand Down
Loading