Skip to content
This repository has been archived by the owner on May 13, 2022. It is now read-only.

Commit

Permalink
bug fix for hanging with bad settings
Browse files Browse the repository at this point in the history
  • Loading branch information
dough10 committed Aug 9, 2015
1 parent f08821c commit cf81ddd
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 15 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ Changelog

- when showing all albums by a artist (from artist list) page now contains a small bio and links to similar artist in your library

- fix a bug where app would get stuck if there was a error connecting to the server while on loading screen.

0.2.5

- fix bug that caused app to display no albums if attempting to remove a folder filter to display all folders.
Expand Down
18 changes: 9 additions & 9 deletions build/PolySonic.js

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions src/elements/subsonic/album-art.html.0.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ Polymer('album-art', {

this.app = document.getElementById("tmpl");

this.audio = this.app.$.player.$.audio;

this.playerArt = document.getElementById("coverArt");

this.app.colorThiefAlbum = this.app.colorThiefAlbum || '#db4437';
Expand Down Expand Up @@ -91,7 +89,7 @@ Polymer('album-art', {
'use strict';
this.app.playlist = this.app.playlist.concat(this.playlist);
this.app.dataLoading = false;
if (this.audio.paused) {
if (this.app.$.player.$.audio.paused) {
this.app.playing = 0;
this.app.$.player.getImageForPlayer(this.imgURL, function () {
this.app.setFabColor(this.playlist[0]);
Expand Down Expand Up @@ -188,7 +186,7 @@ Polymer('album-art', {
disk: 0,
track: 0
});
if (this.audio.paused) {
if (this.app.$.player.$.audio.paused) {
this.app.setFabColor(this.app.playlist[0]);
if (this.app.playing === 0) {
this.app.$.player.playAudio(this.playlist[0]);
Expand Down
7 changes: 5 additions & 2 deletions src/js/PolySonic.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@
});
} else {
app.tracker.sendEvent('Connection Error', e.target.response['subsonic-response'].error.meessage);
app.$.firstRun.toggle();
app.$.firstRun.open();
app.doToast(e.target.response['subsonic-response'].error.meessage);
}
} else {
app.tracker.sendEvent('Connection Error', e.target.response['subsonic-response'].error.meessage);
app.$.firstRun.toggle();
app.$.firstRun.open();
app.doToast(e.target.response['subsonic-response'].error.meessage);
}
});
Expand Down Expand Up @@ -262,6 +262,9 @@
app.dataLoading = false;
app.doToast(chrome.i18n.getMessage("connectionError"));
console.error(e);
if (!document.querySelector('#loader').classList.contains("hide")) {
app.$.firstRun.open();
}
}

app.doXhr = function (url, dataType, callback) {
Expand Down

0 comments on commit cf81ddd

Please sign in to comment.