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

Commit

Permalink
0.2.6 complete
Browse files Browse the repository at this point in the history
  • Loading branch information
dough10 committed Aug 9, 2015
1 parent cf81ddd commit e66c900
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build/PolySonic.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/index.html

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/elements/subsonic/download-manager.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<body>
<polymer-element name="download-manager" constructor="DownloadManager" arrtibutes="hasSaved">
<template>
<app-globals id="globals"></app-globals>
<div horizontal layout class="text">
<div flex vertical layout>
<div style="font-size:16px; min-height:36px;">{{fileName}}</div>
Expand Down
3 changes: 1 addition & 2 deletions src/elements/subsonic/mini-player.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
right:0;
pointer-events: none;
text-align: left;

}
.player {
border-top:1px solid #dddddd;
Expand Down Expand Up @@ -70,7 +69,7 @@
border-color: #000;
}
paper-slider {
width: 106%;
width: 102%;
position: absolute;
top: -16px;
left: -16px;
Expand Down
10 changes: 7 additions & 3 deletions src/elements/subsonic/music-player.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,16 @@ Polymer('music-player',{
var minis = document.querySelectorAll('mini-player');
var length = minis.length;
for (var i = 0; i < length; i++) {
minis[i].setPlaying({artist: obj.artist, title: obj.title, cover: obj.cover});
minis[i].setPlaying(obj);
}
if (obj.artist === '') {
this.app.currentPlaying = obj.title;
this.note.title = obj.title;
this.audio.src = this.app.buildUrl('stream', {format: 'raw', estimateContentLength: true, id: obj.id});
this.audio.src = this.app.buildUrl('stream', {
format: 'raw',
estimateContentLength: true,
id: obj.id
});
} else {
this.app.currentPlaying = obj.artist + ' - ' + obj.title;
this.note.title = obj.artist + ' - ' + obj.title;
Expand All @@ -73,7 +77,7 @@ Polymer('music-player',{
this.$.cover2.style.backgroundImage = "url('" + obj.cover + "')";
this.$.coverArt.style.backgroundImage = "url('" + obj.cover + "')";
this.$.bg.style.backgroundImage = "url('" + obj.cover + "')";
this.app.tracker.sendEvent('Audio', 'Started');
this.app.tracker.sendEvent('Playback Started', new Date());
if (this.app.activeUser.scrobblingEnabled) {
this.app.doXhr(this.app.buildUrl('scrobble', {id: obj.id, time: new Date().getTime()}), 'json', function (e) {
if (e.target.response['subsonic-response'].status === 'failed') {
Expand Down
12 changes: 10 additions & 2 deletions src/js/PolySonic.js
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@
}

app.shufflePlaylist = function () {
app.tracker.sendEvent('Playlist Shuffled', new Date());
var temp = app.playlist[app.playing];
app.playlist.splice(app.playing, 1);
shuffleArray(app.playlist);
Expand Down Expand Up @@ -602,6 +603,7 @@
};

app.shufflePlay = function () {
app.tracker.sendEvent('Shuffle From Menu', new Date());
app.dataLoading = true;
app.shuffleLoading = true;
app.playlist.length = 0;
Expand Down Expand Up @@ -654,6 +656,7 @@
clear playlist
*/
app.clearPlaylist = function () {
app.tracker.sendEvent('Clear Playlist', new Date());
app.$.player.$.audio.pause();
app.$.playlistDialog.close();
app.page = 0;
Expand Down Expand Up @@ -1013,6 +1016,7 @@
/*jslint unparam: true*/
app.selectAction = function (event, detail, sender) {
var wall = app.$.wall;
app.tracker.sendEvent('Sorting By ' + wall.sort, new Date());
if (!app.narrow && app.page !== 0) {
app.page = 0;
app.async(function () {
Expand Down Expand Up @@ -1065,6 +1069,7 @@
/*jslint unparam: false*/

app.getPodcast = function () {
app.tracker.sendEvent('Showing Podcast', new Date());
if (!app.narrow && app.page !== 0) {
app.page = 0;
app.async(function () {
Expand All @@ -1080,6 +1085,7 @@
};

app.getStarred = function () {
app.tracker.sendEvent('Showing Favorites', new Date());
if (!app.narrow && app.page !== 0) {
app.page = 0;
app.async(function () {
Expand All @@ -1095,6 +1101,7 @@
};

app.getArtist = function () {
app.tracker.sendEvent('Showing Artist List', new Date());
if (!app.narrow && app.page !== 0) {
app.page = 0;
app.async(function () {
Expand All @@ -1110,15 +1117,15 @@
};

app.gotoSettings = function () {
app.tracker.sendEvent('Settings Page', new Date());
app.async(function () {
app.$.panel.closeDrawer();
app.page = 2;
});
};

app.refreshPodcast = function (event, detail, sender) {
var animation = new CoreAnimation(),
url;
var animation = new CoreAnimation();
animation.duration = 1000;
animation.iterations = 'Infinity';
animation.keyframes = [
Expand All @@ -1137,6 +1144,7 @@
};

app.addChannel = function () {
app.tracker.sendEvent('Adding Podcast', new Date());
if (!app.castURL) {
app.doToast(app.urlError);
}
Expand Down

0 comments on commit e66c900

Please sign in to comment.