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

Commit

Permalink
release
Browse files Browse the repository at this point in the history
  • Loading branch information
@dough10
dough10 committed May 8, 2015
1 parent 54df869 commit d6bc945
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 61 deletions.
11 changes: 5 additions & 6 deletions build/vulcanized.js
View file

Large diffs are not rendered by default.

48 changes: 21 additions & 27 deletions src/elements/subsonic/album-art.html.0.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Polymer('album-art', {
this.playlist.push(obj);
i = i + 1;
if (i === this.tracks.length) {
this.async(callback);
callback();
}
}.bind(this));
});
Expand All @@ -378,22 +378,18 @@ Polymer('album-art', {
/*
get the data from subsonic server
*/
this.async(function () {
this.app.doXhr(url, 'json', function (e) {
this.trackResponse = e.target.response;
/*
place json in indexeddb
*/
this.async(function () {
this.app.putInDb(this.trackResponse, this.item, function () {
this.async(function () {
this.processJSON(callback);
});
console.log('JSON Data Added to indexedDB ' + this.item);
}.bind(this));
});
}.bind(this));
});
this.app.doXhr(url, 'json', function (e) {
this.trackResponse = e.target.response;
/*
place json in indexeddb
*/
this.async(function () {
this.processJSON(callback);
this.app.putInDb(this.trackResponse, this.item, function () {
console.log('JSON Data Added to indexedDB ' + this.item);
}.bind(this));
});
}.bind(this));
}
}.bind(this));
});
Expand All @@ -417,15 +413,13 @@ Polymer('album-art', {
/*
get image from subsonic server
*/
this.async(function () {
this.app.getImageFile(url, artId, function (event) {
this.setImage(event, function (imgURL) {
this.async(function () {
this.app.colorThiefHandler(imgURL, artId);
});
}.bind(this));
this.app.getImageFile(url, artId, function (event) {
this.setImage(event, function (imgURL) {
this.async(function () {
this.app.colorThiefHandler(imgURL, artId);
});
}.bind(this));
});
}.bind(this));
}
}.bind(this));
});
Expand All @@ -446,9 +440,9 @@ Polymer('album-art', {
/* to be run @ end of loop */
callback = function () {
this.app.getImageForPlayer(this.app.playlist[0].cover, function () {
this.app.setFabColor(this.playlist[0]);
var playURL = this.url + '/rest/stream.view?u=' + this.user + '&p=' + this.pass + '&v=' + this.version + '&c=PolySonic&maxBitRate=' + this.bitRate + '&id=' + this.app.playlist[0].id;
this.app.playing = 0;
var playURL = this.url + '/rest/stream.view?u=' + this.user + '&p=' + this.pass + '&v=' + this.version + '&c=PolySonic&maxBitRate=' + this.bitRate + '&id=' + this.app.playlist[0].id;
this.app.setFabColor(this.app.playlist[0]);
this.app.playAudio(this.app.playlist[0].artist, this.app.playlist[0].title, playURL, this.app.playlist[0].cover, this.app.playlist[0].id);
this.app.dataLoading = false;
this.app.page = 1;
Expand Down
44 changes: 17 additions & 27 deletions src/elements/subsonic/album-wall.html.0.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,16 @@ Polymer('album-wall', {

clearData: function (callback) {
'use strict';
this.async(function () {
this.isLoading = true;
this.app.dataLoading = true;
this.artist = null;
this.podcast = null;
this.wall = null;
this.artists = [];
this.wall = [];
this.podcast = [];
this.resizeLists();
this.async(callback);
});
this.isLoading = true;
this.app.dataLoading = true;
this.artist = null;
this.podcast = null;
this.wall = null;
this.artists = [];
this.wall = [];
this.podcast = [];
this.resizeLists();
this.async(callback);
},

buildObject: function (e) {
Expand Down Expand Up @@ -223,6 +221,7 @@ Polymer('album-wall', {

getPodcast: function () {
'use strict';
this.showing = 'podcast';
this.clearData(function () {
this.app.pageLimit = false;
this.request = 'getPodcasts';
Expand All @@ -233,15 +232,13 @@ Polymer('album-wall', {
'request': this.request,
'mediaFolder': this.mediaFolder
});
this.showing = 'podcast';
this.async(function () {
this.$.ajax.go();
});
this.$.ajax.go();
}.bind(this));
},

getStarred: function () {
'use strict';
this.showing = this.listMode;
this.clearData(function () {
this.app.pageLimit = false;
if (this.queryMethod === 'ID3') {
Expand All @@ -256,10 +253,7 @@ Polymer('album-wall', {
'request': this.request,
'mediaFolder': this.mediaFolder
});
this.showing = this.listMode;
this.async(function () {
this.$.ajax.go();
});
this.$.ajax.go();
}.bind(this));
},

Expand All @@ -276,14 +270,13 @@ Polymer('album-wall', {
'mediaFolder': this.mediaFolder
});
this.showing = 'artists';
this.async(function () {
this.$.ajax.go();
});
this.$.ajax.go();
}.bind(this));
},

sortChanged: function () {
'use strict';
this.showing = this.listMode;
this.clearData(function () {
this.app.pageLimit = false;
if (this.queryMethod === 'ID3') {
Expand All @@ -298,10 +291,7 @@ Polymer('album-wall', {
'request': this.request,
'mediaFolder': this.mediaFolder
});
this.showing = this.listMode;
this.async(function () {
this.$.ajax.go();
});
this.$.ajax.go();
}.bind(this));
},

Expand Down
2 changes: 1 addition & 1 deletion src/js/PolySonic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@
app.bitRate = result.bitRate || 320;
app.shuffleSize = app.shuffleSize || '50';
app.version = '1.11.0';
app.querySize = 30;
app.querySize = 40;
app.volume = result.volume || 100;
app.queryMethod = result.queryMethod || 'ID3';
app.colorThiefEnabled = true;
Expand Down

0 comments on commit d6bc945

Please sign in to comment.