From d8272cdf2e0e3d84b9ff5096159d26d1c83a864a Mon Sep 17 00:00:00 2001 From: Alexander Forselius Date: Wed, 5 Sep 2018 22:33:01 +0200 Subject: [PATCH 01/12] Implemented podcast views --- app.js | 30 +++++- controllers/album.js | 3 + controllers/audiobook.js | 117 ++++++++++++++++++++ controllers/author.js | 111 +++++++++++++++++++ controllers/player.js | 8 +- controllers/playlist.js | 31 ++++-- controllers/publisher.js | 50 +++++++++ controllers/show.js | 132 +++++++++++++++++++++++ directives/header.js | 14 +++ filters/timeago.js | 5 +- index.html | 11 +- partials/album.html | 28 +---- partials/artist.html | 18 +--- partials/audiobook.html | 33 ++++++ partials/author.html | 102 ++++++++++++++++++ partials/generic_header.html | 34 ++++++ partials/playlist.html | 20 +--- partials/publisher.html | 16 +++ partials/show.html | 50 +++++++++ services/api.js | 199 ++++++++++++++++++++++++++++++++++- services/auth.js | 6 +- services/playback.js | 55 ++-------- style.css | 85 +++++++++++---- 23 files changed, 1010 insertions(+), 148 deletions(-) create mode 100644 controllers/audiobook.js create mode 100644 controllers/author.js create mode 100644 controllers/publisher.js create mode 100644 controllers/show.js create mode 100644 directives/header.js create mode 100644 partials/audiobook.html create mode 100644 partials/author.html create mode 100644 partials/generic_header.html create mode 100644 partials/publisher.html create mode 100644 partials/show.html diff --git a/app.js b/app.js index d19213c..719ed0d 100644 --- a/app.js +++ b/app.js @@ -12,23 +12,39 @@ templateUrl: 'partials/playqueue.html', controller: 'PlayQueueController' }). - when('/users/:username', { + when('/users?/:username', { templateUrl: 'partials/user.html', controller: 'UserController' }). - when('/users/:username/tracks', { + when('/users?/:username/tracks', { templateUrl: 'partials/usertracks.html', controller: 'UserTracksController' }). - when('/users/:username/playlists/:playlist', { + when('/users?/:username/playlists/:playlist', { templateUrl: 'partials/playlist.html', controller: 'PlaylistController' }). - when('/artists/:artist', { + when('/playlists?/:playlist', { + templateUrl: 'partials/playlist.html', + controller: 'PlaylistController' + }). + when('/shows?/:show', { + templateUrl: 'partials/show.html', + controller: 'ShowController' + }). + when('/artists?/:artist', { templateUrl: 'partials/artist.html', controller: 'ArtistController' }). - when('/albums/:album', { + when('/authors?/:artist', { + templateUrl: 'partials/author.html', + controller: 'AuthorController' + }). + when('/audiobooks?/:album', { + templateUrl: 'partials/audiobook.html', + controller: 'AudiobookController' + }). + when('/albums?/:album', { templateUrl: 'partials/album.html', controller: 'AlbumController' }). @@ -40,6 +56,10 @@ templateUrl: 'partials/browsecategory.html', controller: 'BrowseCategoryController' }). + when('/publishers?/:identifier', { + templateUrl: 'partials/publisher.html', + controller: 'PublisherController' + }). otherwise({ redirectTo: '/' }); diff --git a/controllers/album.js b/controllers/album.js index 6999123..1efb0bc 100644 --- a/controllers/album.js +++ b/controllers/album.js @@ -13,6 +13,9 @@ API.getAlbum($scope.album).then(function(album) { console.log('got album', album); $scope.data = album; + $scope.type = album.album_type + + album.authors = album.artists $scope.release_year = ''; diff --git a/controllers/audiobook.js b/controllers/audiobook.js new file mode 100644 index 0000000..a5b937d --- /dev/null +++ b/controllers/audiobook.js @@ -0,0 +1,117 @@ +(function() { + + var module = angular.module('PlayerApp'); + + module.controller('AudiobookController', function($scope, $rootScope, API, PlayQueue, $routeParams) { + $scope.album = $routeParams.album; + console.log($scope.album) + $scope.data = null; + $scope.release_year = ''; + $scope.total_duration = 0; + $scope.num_discs = 0; + $scope.tracks = []; + + API.getAlbum($scope.album).then(function(album) { + console.log('got album', album); + album.authors = album.artists.map(r => { + return { + id: r.id, + name: r.name, + type: 'author' + } + }) + console.log("ALBUM", album) + $scope.data = album; + $scope.data.type = 'audiobook' + + + $scope.release_year = ''; + + if (album.release_date) { + $scope.release_year = album.release_date.substring(0, 4); // så fult! + } + + }); + + API.getAlbumTracks($scope.album).then(function(tracks) { + console.log('got album tracks', tracks); + + // split into discs + var discs = []; + var disc = { disc_number: 1, tracks: [] }; + var tot = 0; + tracks.items.forEach(function(track) { + tot += track.duration_ms; + if (track.disc_number != disc.disc_number) { + discs.push(disc); + disc = { disc_number: track.disc_number, tracks: [] }; + } + disc.tracks.push(track); + + track.popularity = 0; + }); + discs.push(disc); + console.log('discs', discs); + $scope.discs = discs; + $scope.tracks = tracks.items; + $scope.num_discs = discs.length; + $scope.total_duration = tot; + + // find out if they are in the user's collection + var ids = $scope.tracks.map(function(track) { + return track.id; + }); + + + API.getTracks(ids).then(function(results) { + results.tracks.forEach(function(result, index) { + $scope.tracks[index].popularity = result.popularity; + }); + }); + + API.containsUserTracks(ids).then(function(results) { + results.forEach(function(result, index) { + $scope.tracks[index].inYourMusic = result; + }); + }); + + }); + + $scope.currenttrack = PlayQueue.getCurrent(); + $rootScope.$on('playqueuechanged', function() { + $scope.currenttrack = PlayQueue.getCurrent(); + }); + + $scope.play = function(trackuri) { + var trackuris = $scope.tracks.map(function(track) { + return track.uri; + }); + PlayQueue.clear(); + PlayQueue.enqueueList(trackuris); + PlayQueue.playFrom(trackuris.indexOf(trackuri)); + }; + + $scope.playall = function() { + var trackuris = $scope.tracks.map(function(track) { + return track.uri; + }); + PlayQueue.clear(); + PlayQueue.enqueueList(trackuris); + PlayQueue.playFrom(0); + }; + + $scope.toggleFromYourMusic = function(index) { + if ($scope.tracks[index].inYourMusic) { + API.removeFromMyTracks([$scope.tracks[index].id]).then(function(response) { + $scope.tracks[index].inYourMusic = false; + }); + } else { + API.addToMyTracks([$scope.tracks[index].id]).then(function(response) { + $scope.tracks[index].inYourMusic = true; + }); + } + }; + + }); + +})(); diff --git a/controllers/author.js b/controllers/author.js new file mode 100644 index 0000000..cebf1ef --- /dev/null +++ b/controllers/author.js @@ -0,0 +1,111 @@ +(function() { + + var module = angular.module('PlayerApp'); + + module.controller('AuthorController', function($scope, $rootScope, API, PlayQueue, $routeParams, Auth) { + $scope.artist = $routeParams.artist; + $scope.data = null; + $scope.discog = []; + $scope.albums = []; + $scope.singles = []; + $scope.appearson = []; + + $scope.currenttrack = PlayQueue.getCurrent(); + $scope.isFollowing = false; + $scope.isFollowHovered = false; + $rootScope.$on('playqueuechanged', function() { + $scope.currenttrack = PlayQueue.getCurrent(); + }); + + API.getArtist($scope.artist).then(function(artist) { + console.log('got artist', artist); + $scope.data = artist; + $scope.data.type = 'author' + }); + + API.getArtistTopTracks($scope.artist, Auth.getUserCountry()).then(function(toptracks) { + console.log('got artist', toptracks); + $scope.toptracks = toptracks.tracks; + + var ids = $scope.toptracks.map(function(track) { + return track.id; + }); + + API.containsUserTracks(ids).then(function(results) { + results.forEach(function(result, index) { + $scope.toptracks[index].inYourMusic = result; + }); + }); + }); + + API.getArtistAlbums($scope.artist, Auth.getUserCountry()).then(function(albums) { + console.log('got artist albums', albums); + $scope.albums = []; + $scope.singles = []; + $scope.appearson = []; + albums.items.forEach(function(album) { + console.log(album); + if (album.album_type == 'album') { + $scope.albums.push(album); + } + if (album.album_type == 'single') { + $scope.singles.push(album); + } + if (album.album_type == 'appears-on') { + $scope.appearson.push(album); + } + }) + }); + + API.isFollowing($scope.artist, "artist").then(function(booleans) { + console.log("Got following status for artist: " + booleans[0]); + $scope.isFollowing = booleans[0]; + }); + + $scope.playtoptrack = function(trackuri) { + var trackuris = $scope.toptracks.map(function(track) { + return track.uri; + }); + PlayQueue.clear(); + PlayQueue.enqueueList(trackuris); + PlayQueue.playFrom(trackuris.indexOf(trackuri)); + }; + + $scope.playall = function(trackuri) { + var trackuris = $scope.toptracks.map(function(track) { + return track.uri; + }); + PlayQueue.clear(); + PlayQueue.enqueueList(trackuris); + PlayQueue.playFrom(0); + }; + + $scope.follow = function(isFollowing) { + if (isFollowing) { + API.unfollow($scope.artist, "artist").then(function() { + $scope.isFollowing = false; + $scope.data.followers.total--; + }); + } else { + API.follow($scope.artist, "artist").then(function() { + $scope.isFollowing = true; + $scope.data.followers.total++; + }); + } + }; + + $scope.toggleFromYourMusic = function(index) { + if ($scope.toptracks[index].inYourMusic) { + API.removeFromMyTracks([$scope.toptracks[index].id]).then(function(response) { + $scope.toptracks[index].inYourMusic = false; + }); + } else { + API.addToMyTracks([$scope.toptracks[index].id]).then(function(response) { + $scope.toptracks[index].inYourMusic = true; + }); + } + }; + + }); + +})(); diff --git a/controllers/player.js b/controllers/player.js index e93c52f..38d1aa3 100644 --- a/controllers/player.js +++ b/controllers/player.js @@ -82,7 +82,13 @@ $scope.loadsearch = function() { console.log('search for', $scope.query); - $location.path('/search').search({ q: $scope.query }).replace(); + if ($scope.query.indexOf('spotify:') == 0) { + let path = '/' + $scope.query.substr('spotify:'.length).replace(/\:/, '/') + console.log(path) + $location.path(path) + } else { + $location.path('/search').search({ q: $scope.query }).replace(); + } }; diff --git a/controllers/playlist.js b/controllers/playlist.js index 85be220..3d0decb 100644 --- a/controllers/playlist.js +++ b/controllers/playlist.js @@ -17,15 +17,17 @@ $rootScope.$on('playqueuechanged', function() { $scope.currenttrack = PlayQueue.getCurrent(); }); - - API.getPlaylist($scope.username, $scope.playlist).then(function(list) { + let promise = $scope.username ? API.getPlaylist($scope.username, $scope.playlist) : API.getPlaylistById($scope.playlist) + promise.then(function(list) { console.log('got playlist', list); $scope.name = list.name; $scope.data = list; + $scope.username = list.owner.id $scope.playlistDescription = $sce.trustAsHtml(list.description); }); - - API.getPlaylistTracks($scope.username, $scope.playlist).then(function(list) { + promise = $scope.username ? API.getPlaylistTracks($scope.username, $scope.playlist) : API.getTracksInPlaylistById($scope.playlist) + + promise.then(function(list) { console.log('got playlist tracks', list); var tot = 0; list.items.forEach(function(track) { @@ -54,6 +56,8 @@ } }); + promise = $scope.username ? API.isFollowingPlaylist($scope.username, $scope.playlist) : API.isFollowingPlaylistById($scope.playlist) + API.isFollowingPlaylist($scope.username, $scope.playlist).then(function(booleans) { console.log("Got following status for playlist: " + booleans[0]); $scope.isFollowing = booleans[0]; @@ -61,12 +65,14 @@ $scope.follow = function(isFollowing) { if (isFollowing) { - API.unfollowPlaylist($scope.username, $scope.playlist).then(function() { + let promise = $scope.username ? API.unfollowPlaylist($scope.username, $scope.playlist) : API.unfollowPlaylistById($scope.playlist) + promise.then(function() { $scope.isFollowing = false; $rootScope.$emit('playlistsubscriptionchange'); }); } else { - API.followPlaylist($scope.username, $scope.playlist).then(function() { + let promise = $scope.username ? API.followPlaylist($scope.username, $scope.playlist) : API.followPlaylistById($scope.playlist) + promise.then(function () { $scope.isFollowing = true; $rootScope.$emit('playlistsubscriptionchange'); }); @@ -109,12 +115,17 @@ 'Delete', function ($itemScope) { var position = $itemScope.$index; - API.removeTrackFromPlaylist( + let promise = $scope.username ? API.removeTrackFromPlaylist( $scope.username, $scope.playlist, - $itemScope.t.track, position).then(function() { - $scope.tracks.splice(position, 1); - }); + $itemScope.t.track, position) : + API.removeTrackFromPlaylistById( + $scope.playlist, + $itemScope.t.track, position) + + promise.then(function() { + $scope.tracks.splice(position, 1); + }); }]] } else { return null; diff --git a/controllers/publisher.js b/controllers/publisher.js new file mode 100644 index 0000000..eb9df1d --- /dev/null +++ b/controllers/publisher.js @@ -0,0 +1,50 @@ +(function() { + + var module = angular.module('PlayerApp'); + + module.controller('PublisherController', function($scope, API, $location, $routeParams, PlayQueue, $routeParams) { + $scope.query = $routeParams.identifier; + $scope.tracks = []; + + $scope.data = { + id: $scope.query, + type: 'publisher', + name: $scope.query, + uri: 'spotify:publisher:' + $scope.query, + images: [{ + + }] + } + + API.findShows($scope.query).then(function(results) { + console.log('got search results', results); + $scope.shows = results.shows.items; + if ($scope.shows.length > 0) { + $scope.data.images = $scope.shows[0].images + } + $scope.digest() + }); + + $scope.play = function(trackuri) { + var trackuris = $scope.tracks.map(function(track) { + return track.uri; + }); + PlayQueue.clear(); + PlayQueue.enqueueList(trackuris); + PlayQueue.playFrom(trackuris.indexOf(trackuri)); + }; + + $scope.toggleFromYourMusic = function(index) { + if ($scope.tracks[index].inYourMusic) { + API.removeFromMyTracks([$scope.tracks[index].id]).then(function(response) { + $scope.tracks[index].inYourMusic = false; + }); + } else { + API.addToMyTracks([$scope.tracks[index].id]).then(function(response) { + $scope.tracks[index].inYourMusic = true; + }); + } + }; + }); + +})(); diff --git a/controllers/show.js b/controllers/show.js new file mode 100644 index 0000000..65e11b4 --- /dev/null +++ b/controllers/show.js @@ -0,0 +1,132 @@ +(function() { + + var module = angular.module('PlayerApp'); + + module.controller('ShowController', function($scope, $rootScope, API, PlayQueue, $routeParams, Auth, $sce) { + $scope.show = $routeParams.show; + $scope.username = $routeParams.username; + console.log($routeParams); + $scope.name = ''; + $scope.episodes = []; + $scope.data = null; + $scope.total_duration = 0; + + $scope.currentepisode = PlayQueue.getCurrent(); + $scope.isFollowing = false; + $scope.isFollowHovered = false; + + $rootScope.$on('playqueuechanged', function() { + $scope.currentepisode = PlayQueue.getCurrent(); + }); + + API.getShow($scope.show).then(function(list) { + console.log('got show', list); + $scope.name = list.name; + $scope.data = list; + $scope.data.description = $sce.trustAsHtml(list.description); + $scope.data.authors = [{ + id: $scope.data.publisher, + name: $scope.data.publisher, + type: 'publisher' + }] + }); + + API.getShowEpisodes($scope.show).then(function(list) { + console.log('got show episodes', list); + var tot = 0; + list.items.forEach(function(episode) { + tot += episode.duration_ms; + }); + $scope.episodes = list.items; + console.log('tot', tot); + $scope.total_duration = tot; + + // find out if they are in the user's collection + var ids = $scope.episodes.map(function(episode) { + return episode.id; + }); + + var i, j, temparray, chunk = 20; + for (i = 0, j = ids.length; i < j; i += chunk) { + temparray = ids.slice(i, i + chunk); + var firstIndex = i; + (function(firstIndex){ + API.containsUserTracks(temparray).then(function(results) { + results.forEach(function(result, index) { + $scope.episodes[firstIndex + index].episode.inYourMusic = result; + }); + }); + })(firstIndex); + } + }); + + /* API.isFollowingShow($scope.username, $scope.show).then(function(booleans) { + console.log("Got following status for show: " + booleans[0]); + $scope.isFollowing = booleans[0]; + }); +*/ + $scope.follow = function(isFollowing) { + /* if (isFollowing) { + API.unfollowShow($scope.username, $scope.show).then(function() { + $scope.isFollowing = false; + $rootScope.$emit('showsubscriptionchange'); + }); + } else { + API.followShow($scope.username, $scope.show).then(function() { + $scope.isFollowing = true; + $rootScope.$emit('showsubscriptionchange'); + }); + }*/ + }; + + $scope.play = function(episodeuri) { + var episodeuris = $scope.episodes.map(function(episode) { + return episode.episode.uri; + }); + PlayQueue.clear(); + PlayQueue.enqueueList(episodeuris); + PlayQueue.playFrom(episodeuris.indexOf(episodeuri)); + }; + + $scope.playall = function() { + var episodeuris = $scope.episodes.map(function(episode) { + return episode.episode.uri; + }); + PlayQueue.clear(); + PlayQueue.enqueueList(episodeuris); + PlayQueue.playFrom(0); + }; + + $scope.toggleFromYourMusic = function(index) { + if ($scope.episodes[index].episode.inYourMusic) { + API.removeFromMyTracks([$scope.episodes[index].episode.id]).then(function(response) { + $scope.episodes[index].episode.inYourMusic = false; + }); + } else { + API.addToMyTracks([$scope.episodes[index].episode.id]).then(function(response) { + $scope.episodes[index].episode.inYourMusic = true; + }); + } + }; + + $scope.menuOptionsShowTrack = function() { + if ($scope.username === Auth.getUsername()) { + return [[ + 'Delete', + function ($itemScope) { + var position = $itemScope.$index; + API.removeTrackFromShow( + $scope.username, + $scope.show, + $itemScope.t.episode, position).then(function() { + $scope.episodes.splice(position, 1); + }); + }]] + } else { + return null; + } + }; + + }); + +})(); diff --git a/directives/header.js b/directives/header.js new file mode 100644 index 0000000..aca7483 --- /dev/null +++ b/directives/header.js @@ -0,0 +1,14 @@ +(function() { + + var module = angular.module('PlayerApp'); + + module.directive('genericHeader', function() { + return { + restrict: 'E', + scope: { + data: '=ngModel' + }, + templateUrl: '/partials/generic_header.html' + }; + }); +})(); \ No newline at end of file diff --git a/filters/timeago.js b/filters/timeago.js index e0341ca..024acc5 100644 --- a/filters/timeago.js +++ b/filters/timeago.js @@ -37,7 +37,10 @@ years = days / 365, separator = strings.wordSeparator === undefined ? " " : strings.wordSeparator, suffix = strings.suffixAgo; - + if (days > 15) { + var time = new Date(input) + return time.getFullYear() + '-' + time.getMonth() + '-' + time.getDate() + } words = seconds < 45 && substitute(strings.seconds, Math.round(seconds), strings) || seconds < 90 && substitute(strings.minute, 1, strings) || minutes < 45 && substitute(strings.minutes, Math.round(minutes), strings) || diff --git a/index.html b/index.html index ab119a5..f84bd14 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,8 @@ Thirtify + + @@ -14,14 +16,19 @@ + + + + + @@ -34,7 +41,9 @@
- +
+ +
SAMPLE PLAYER APPLICATION diff --git a/partials/album.html b/partials/album.html index 4541f26..bd8d6db 100644 --- a/partials/album.html +++ b/partials/album.html @@ -1,30 +1,6 @@ -
-
- -
- -

Single

-

Album

-

Compilation

-

{{data.name}}

- -
- PLAY ALL -
-
+ -
-

- By {{data.artists[0].name}} - · - {{release_year}} - · - {{data.tracks.total}} Songs - · - Total {{total_duration | displaytime}} -

-
-
+
diff --git a/partials/artist.html b/partials/artist.html index 80046c6..7540edf 100644 --- a/partials/artist.html +++ b/partials/artist.html @@ -1,20 +1,4 @@ -
-
- -
- -

ARTIST

-

{{data.name}}

-
{{data.followers.total | number}} followers
- -
- PLAY ALL - {{ isFollowing ? (isFollowHovered ? 'UNFOLLOW' : 'FOLLOWING') : 'FOLLOW' }} -
-
- -
-
+

Popular tracks

diff --git a/partials/audiobook.html b/partials/audiobook.html new file mode 100644 index 0000000..cebd614 --- /dev/null +++ b/partials/audiobook.html @@ -0,0 +1,33 @@ + + + + +
+
+

+ CD {{ d.disc_number }} +

+
+ + + + + + + + + + + + + +
#CHAPTERTIME
{{t.track_number}} + {{t.name}} + {{t.duration_ms | displaytime}}
+
+
+
+ + + +

(C) (P) info

diff --git a/partials/author.html b/partials/author.html new file mode 100644 index 0000000..be05169 --- /dev/null +++ b/partials/author.html @@ -0,0 +1,102 @@ + + +

Popular chapters

+ + + + + + + + + + + + + + + + + + +
#CHAPTERBOOKTIME
{{$index + 1}} + + {{t.name}}{{t.album.name}}{{t.duration_ms | displaytime}}
+ +
+
+ +
+

Books

+ +
+
+
+ +
+

Books

+ +
+
+
+ +
+

Featured on

+ +
+
+
+ + diff --git a/partials/generic_header.html b/partials/generic_header.html new file mode 100644 index 0000000..ae4da91 --- /dev/null +++ b/partials/generic_header.html @@ -0,0 +1,34 @@ +
+
+
+ +
+
+

COLLABORATIVE PLAYLIST

+

{{data.type.toUpperCase()}}

+

{{data.name}}

+

+

by {{author.name || author.id}} +

+ +
+ PLAY ALL + {{ isFollowing ? (isFollowHovered ? 'UNFOLLOW' : 'FOLLOWING') : 'FOLLOW' }} +
{{data.followers.total | number}} followers
+ +
+ +
+
+ +
+ + + {{release_year}} + · + + + + Total {{total_duration | displaytime}} · {{data.tracks.total}} songs · {{ total_duration | displaytime }} + +
\ No newline at end of file diff --git a/partials/playlist.html b/partials/playlist.html index bdd2e47..ec0f66c 100644 --- a/partials/playlist.html +++ b/partials/playlist.html @@ -1,22 +1,6 @@ -
- -

COLLABORATIVE PLAYLIST

-

PLAYLIST

-

{{data.name}}

-

-
{{data.followers.total | number}} followers
+ + -
- PLAY ALL - {{ isFollowing ? (isFollowHovered ? 'UNFOLLOW' : 'FOLLOWING') : 'FOLLOW' }} -
-
- -
-

Created by: {{data.owner.id}} · {{data.tracks.total}} songs · {{ total_duration | displaytime }}

- -
-
diff --git a/partials/publisher.html b/partials/publisher.html new file mode 100644 index 0000000..7594b13 --- /dev/null +++ b/partials/publisher.html @@ -0,0 +1,16 @@ + + +

SHOWS

+ + +
diff --git a/partials/show.html b/partials/show.html new file mode 100644 index 0000000..503cc42 --- /dev/null +++ b/partials/show.html @@ -0,0 +1,50 @@ + +

Episodes

+
+ + + + + + + + + + + + + + +
+
+ +
+
+ +
+ 		+ + {{t.name}} + +

Published {{t.release_date | timeago}}

+

{{t.description}}

+ 		+

Published {{t.release_date | timeago}}

+
+
+ +
+ + diff --git a/services/api.js b/services/api.js index 6405474..0162a06 100644 --- a/services/api.js +++ b/services/api.js @@ -1,11 +1,48 @@ (function() { + + window.spotifyDeviceId = null + window.spotifyDevices = [] + + window.player = null var module = angular.module('PlayerApp'); module.factory('API', function(Auth, $q, $http) { var baseUrl = 'https://api.spotify.com/v1'; - + + window.onSpotifyWebPlaybackSDKReady = () => { + const token = Auth.getAccessToken(); + const player = new Spotify.Player({ + name: 'Thirtify', + getOAuthToken: cb => { cb(token); } + }); + + // Error handling + player.addListener('initialization_error', ({ message }) => { console.error(message); }); + player.addListener('authentication_error', ({ message }) => { console.error(message); }); + player.addListener('account_error', ({ message }) => { console.error(message); }); + player.addListener('playback_error', ({ message }) => { console.error(message); }); + + // Playback status updates + player.addListener('player_state_changed', state => { console.log(state); }); + + // Ready + player.addListener('ready', ({ device_id }) => { + window.currentSpotifyDeviceId = device_id + + console.log('Ready with Device ID', window.currentSpotifyDeviceId); + }); + + // Not Ready + player.addListener('not_ready', ({ device_id }) => { + console.log('Device ID has gone offline', window.currentSpotifyDeviceId); + }); + + // Connect to the player! + player.connect(); + window.player = player + } return { getMe: function() { @@ -142,6 +179,18 @@ }); return ret.promise; }, + getPlaylistById: function (identifier) { + var ret = $q.defer(); + $http.get(baseUrl + '/playlists/' + encodeURIComponent(identifier), { + headers: { + 'Authorization': 'Bearer ' + Auth.getAccessToken() + } + }).success(function(r) { + console.log('got playlists', r); + ret.resolve(r); + }); + return ret.promise; + }, getPlaylist: function(username, playlist) { var ret = $q.defer(); @@ -156,6 +205,19 @@ return ret.promise; }, + getShow: function(identifier) { + var ret = $q.defer(); + $http.get(baseUrl + '/shows/' + encodeURIComponent(identifier), { + headers: { + 'Authorization': 'Bearer ' + Auth.getAccessToken() + } + }).success(function(r) { + console.log('got show', r); + ret.resolve(r); + }); + return ret.promise; + }, + getPlaylistTracks: function(username, playlist) { var ret = $q.defer(); $http.get(baseUrl + '/users/' + encodeURIComponent(username) + '/playlists/' + encodeURIComponent(playlist) + '/tracks', { @@ -169,6 +231,45 @@ return ret.promise; }, + + getShowEpisodes: function(identifier) { + var ret = $q.defer(); + $http.get(baseUrl + '/shows/' + encodeURIComponent(identifier) + '/episodes', { + headers: { + 'Authorization': 'Bearer ' + Auth.getAccessToken() + } + }).success(function(r) { + console.log('got show episodes', r); + ret.resolve(r); + }); + return ret.promise; + }, + + getTracksInPlaylistById: function(identifier) { + var ret = $q.defer(); + $http.get(baseUrl + '/playlists/' + encodeURIComponent(identifier) + '/tracks', { + headers: { + 'Authorization': 'Bearer ' + Auth.getAccessToken() + } + }).success(function(r) { + console.log('got playlist tracks', r); + ret.resolve(r); + }); + return ret.promise; + }, + getEpisodesInShow: function(identifier) { + var ret = $q.defer(); + $http.get(baseUrl + '/shows/' + encodeURIComponent(identifier) + '/episodes', { + headers: { + 'Authorization': 'Bearer ' + Auth.getAccessToken() + } + }).success(function(r) { + console.log('got episodes in show', r); + ret.resolve(r); + }); + return ret.promise; + }, + changePlaylistDetails: function(username, playlist, options) { var ret = $q.defer(); $http.put(baseUrl + '/users/' + encodeURIComponent(username) + '/playlists/' + encodeURIComponent(playlist), options, { @@ -182,6 +283,19 @@ return ret.promise; }, + changeDetailsOfPlaylistById: function(playlist, options) { + var ret = $q.defer(); + $http.put(baseUrl + '/playlists/' + encodeURIComponent(playlist), options, { + headers: { + 'Authorization': 'Bearer ' + Auth.getAccessToken() + } + }).success(function(r) { + console.log('got response after changing playlist details', r); + ret.resolve(r); + }); + return ret.promise; + }, + removeTrackFromPlaylist: function(username, playlist, track, position) { var ret = $q.defer(); $http.delete(baseUrl + '/users/' + encodeURIComponent(username) + '/playlists/' + encodeURIComponent(playlist) + '/tracks', @@ -202,6 +316,26 @@ return ret.promise; }, + removeTrackFromPlaylistById: function(playlist, track, position) { + var ret = $q.defer(); + $http.delete(baseUrl + '/playlists/' + encodeURIComponent(playlist) + '/tracks', + { + data: { + tracks: [{ + uri: track.uri, + position: position + }] + }, + headers: { + 'Authorization': 'Bearer ' + Auth.getAccessToken() + } + }).success(function(r) { + console.log('remove track from playlist', r); + ret.resolve(r); + }); + return ret.promise; + }, + getTrack: function(trackid) { var ret = $q.defer(); $http.get(baseUrl + '/tracks/' + encodeURIComponent(trackid), { @@ -241,6 +375,43 @@ return ret.promise; }, + playTracks: function (uris) { + var ret = $q.defer(); + $http.put(baseUrl + '/me/player/player/play?device_id=' + window.currentSpotifyDeviceId + '/tracks', { + headers: { + 'Authorization': 'Bearer ' + Auth.getAccessToken() + }, + body: JSON.stringify({ + uris: [uris] + }) + }).success(function(r) { + console.log('got album tracks', r); + ret.resolve(r); + }); + return ret.promise; + }, + + seekPlayback(pos) { + var ret = $q.defer(); + player.seek(pos * 1000); + return ret.promise + ret.resolve() + }, + + resumePlayback() { + var ret = $q.defer(); + player.resume().then(() => {}); + return ret.promise + ret.resolve() + }, + + pausePlayback() { + var ret = $q.defer(); + player.pause().then(() => {}); + return ret.promise + ret.resolve() + }, + getAlbumTracks: function(albumid) { var ret = $q.defer(); $http.get(baseUrl + '/albums/' + encodeURIComponent(albumid) + '/tracks', { @@ -306,6 +477,32 @@ return ret.promise; }, + findShows: function(query) { + var ret = $q.defer(); + $http.get(baseUrl + '/search?type=show&q=' + encodeURIComponent(query) + '&market=from_token', { + headers: { + 'Authorization': 'Bearer ' + Auth.getAccessToken() + } + }).success(function(r) { + console.log('got search results for shows', r); + ret.resolve(r); + }); + return ret.promise; + }, + + findEpisodes: function(query) { + var ret = $q.defer(); + $http.get(baseUrl + '/search?type=episode&q=' + encodeURIComponent(query) + '&market=from_token', { + headers: { + 'Authorization': 'Bearer ' + Auth.getAccessToken() + } + }).success(function(r) { + console.log('got search results for episodes', r); + ret.resolve(r); + }); + return ret.promise; + }, + getNewReleases: function(country) { var ret = $q.defer(); $http.get(baseUrl + '/browse/new-releases?country=' + encodeURIComponent(country), { diff --git a/services/auth.js b/services/auth.js index 3369c3e..4bbd090 100644 --- a/services/auth.js +++ b/services/auth.js @@ -32,7 +32,11 @@ 'user-library-read', 'user-library-modify', 'user-follow-read', - 'user-follow-modify' + 'user-follow-modify', + "streaming", + "user-read-birthdate", + "user-read-email", + "user-read-private" ]); var width = 450, diff --git a/services/playback.js b/services/playback.js index c12c3d1..acda0ef 100644 --- a/services/playback.js +++ b/services/playback.js @@ -3,6 +3,8 @@ var module = angular.module('PlayerApp'); module.factory('Playback', function($rootScope, API, $interval) { + + var _playing = false; var _track = ''; var _volume = 100; @@ -43,30 +45,10 @@ var audiotag = new Audio(); - function createAndPlayAudio(url, callback, endcallback) { - console.log('createAndPlayAudio', url); - if (audiotag.src != null) { - audiotag.pause(); - audiotag.src = null; - } - audiotag.src = url; - audiotag.addEventListener('loadedmetadata', function() { - console.log('audiotag loadedmetadata'); - _duration = audiotag.duration * 1000.0; - audiotag.volume = _volume / 100.0; - audiotag.play(); - callback(); - }, false); - audiotag.addEventListener('ended', function() { - console.log('audiotag ended'); - _playing = false; - _track = ''; - disableTick(); - $rootScope.$emit('endtrack'); - }, false); - } + return { + getVolume: function() { return _volume; }, @@ -82,15 +64,7 @@ _progress = 0; var trackid = trackuri.split(':')[2]; - // workaround to be able to play on mobile - // we need to play as a response to a touch event - // play + immediate pause of an empty song does the trick - // see http://stackoverflow.com/questions/12517000/no-sound-on-ios-6-web-audio-api - audiotag.src=''; - audiotag.play(); - audiotag.pause(); - - API.getTrack(trackid).then(function(trackdata) { + API.playTracks([trackuri]).then(function(trackdata) { console.log('playback got track', trackdata); createAndPlayAudio(trackdata.preview_url, function() { _trackdata = trackdata; @@ -104,25 +78,16 @@ stopPlaying: function() { _playing = false; _track = ''; - audiotag.stop(); + API.stopPlayback().then(function () {}); _trackdata = null; $rootScope.$emit('playerchanged'); }, pause: function() { - if (_track != '') { - _playing = false; - audiotag.pause(); - $rootScope.$emit('playerchanged'); - disableTick(); - } + API.pausePlayback().then(function () {}); }, resume: function() { - if (_track != '') { - _playing = true; - audiotag.play(); - $rootScope.$emit('playerchanged'); - enableTick(); - } + + API.resulePlayback().then(function () {}); }, isPlaying: function() { return _playing; @@ -137,7 +102,7 @@ return _progress; }, setProgress: function(pos) { - audiotag.currentTime = pos / 1000.0; + API.seekPlayback(pos).then(function () {}) }, getDuration: function() { return _duration; diff --git a/style.css b/style.css index 8ed9a42..0c6d451 100644 --- a/style.css +++ b/style.css @@ -1,6 +1,14 @@ +:root { + --background-color: #121314; + --color: #fefefe; + --primary-color: #1db954; +} + + + body { - background: #121314; - color: #ddd; + background: var(--background-color); + color: var(--color); margin: 0; padding: 0; border: 0; @@ -21,6 +29,15 @@ div.fullview { height: 100%; } +.episodes td { + padding-top: 20pt; + padding-bottom: 20pt; +} + +th { + opacity: 0.5; +} + h1 { font-family: 'Open Sans', sans-serif; font-weight: 300; @@ -70,7 +87,7 @@ b { hr { display: block; border: none; - border-top: 1px solid #222326; + border-top: 1px solid #22232622; background-color: transparent; margin: 0 0 10px 0; clear: both; @@ -248,6 +265,9 @@ hr { padding: 0px; overflow: auto; } +.menuview .list a { + color: white; +} .menuview .preview { position: absolute; @@ -279,19 +299,45 @@ hr { outline: 0; border: 1px solid #393b40; } - +h1 { + color: var(--color); + font-weight: bold; +} +generic-header { + padding: 20pt; +} .mainview { position: absolute; left: 220px; top: 0px; right: 0px; bottom: 0px; - padding: 20px; + padding: 0px; overflow: auto; color: #88898c; + /* Permalink - use to edit and share this gradient: http://colorzilla.com/gradient-editor/#ffffff+0,ffffff+100&0.25+0,0+100 */ } +.mainview > .ng-scope > * { + margin: 20pt; +} +.mainview > .ng-scope > generic-header { + margin: 0pt !important; +} + +.mainview > .ng-scope a { + color: var(--color); +} + +.mainview > .ng-scope { + background: -moz-linear-gradient(top, rgba(255,255,255,0.15) 0%, rgba(255,255,255,0) 20%); /* FF3.6-15 */ +background: var(--background-color), -webkit-linear-gradient(top, rgba(255,255,255,0.15) 0%,rgba(255,255,255,0) 10%); /* Chrome10-25,Safari5.1-6 */ +background: linear-gradient(to bottom, rgba(255,255,255,0.15) 0%,rgba(255,255,255,0) 8%), var(--background-color); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */ +filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#40ffffff', endColorstr='#00ffffff',GradientType=0 ); /* IE6-9 */ + +} .mainview a { + padding: 0pt; color: #fff; } @@ -341,15 +387,15 @@ a.button { } a.button.green { - background-color: #070; + background-color: var(--primary-color); color: #fff; - border: 1px solid #070; + border: 1px solid var(--primary-color); } a.button.big.green { display: inline-block; text-align: center; - background-color: #070; + background-color: var(--primary-color); color: #fff; padding: 10px 40px; border-radius: 50px; @@ -357,7 +403,7 @@ a.button.big.green { a.button.button-add { color: #fff; - border: 1px solid #070; + border: 1px solid var(--primary-color); } .pop-meter { @@ -404,11 +450,10 @@ a.button.button-add { header { position: relative; - height: 220px; + height: 230px; } header div.cover { - position: absolute; left: 0px; top: 0px; width: 200px; @@ -418,13 +463,10 @@ header div.cover { overflow: hidden; } -header .playlist-cover { - position: relative; -} + header .cover-component { background-size: cover; - position: absolute; width: 100px; height: 100px; } @@ -450,26 +492,21 @@ header .cover-component:nth-child(4) { } header div.buttons { - position: absolute; left: 210px; bottom: 20px; } header p { - padding-left: 210px; } header h1 { margin-top: -5px; - padding-left: 210px; } header h4 { - padding-left: 210px; } header .follower-count { - padding-left: 210px; } table.tracks { @@ -512,9 +549,13 @@ table tr th { text-align: left; font-weight: 300; font-size: 9pt; - color: #fff; + color: var(--color); padding: 4px 10px 4px 0; } +td, th { + border-bottom: 1pt solid rgba(0, 0, 0, .1); +} + ul.albums, ul.playlists, ul.genres { margin: 0; @@ -529,7 +570,7 @@ ul.albums li, ul.playlists li, ul.genres li { width: 160px; height: 220px; margin: 0 10px 10px 0; - background-color: #393b40; + /*background-color: #393b40;*/ } ul.albums li responsive-cover, ul.playlists li responsive-cover, ul.genres li img { From 3966e0eb74ee73443629d554e9b5cb7959dc61c8 Mon Sep 17 00:00:00 2001 From: Alexander Forselius Date: Thu, 6 Sep 2018 13:37:29 +0200 Subject: [PATCH 02/12] Working on search result --- controllers/searchresults.js | 4 + grid12.css | 913 +++++++++++++++++++++++++++++++++++ index.html | 1 + partials/album.html | 2 +- partials/result.html | 19 + partials/searchresults.html | 87 +++- services/api.js | 15 +- services/playback.js | 14 +- style.css | 8 +- 9 files changed, 1038 insertions(+), 25 deletions(-) create mode 100644 grid12.css create mode 100644 partials/result.html diff --git a/controllers/searchresults.js b/controllers/searchresults.js index 021b59a..e167094 100644 --- a/controllers/searchresults.js +++ b/controllers/searchresults.js @@ -10,6 +10,10 @@ console.log('got search results', results); $scope.tracks = results.tracks.items; $scope.playlists = results.playlists.items; + $scope.artists = results.artists.items; + $scope.albums = results.albums.items; + $scope.shows = results.shows.items; + $scope.episodes = results.episodes.items; // find out if they are in the user's collection var ids = $scope.tracks.map(function(track) { diff --git a/grid12.css b/grid12.css new file mode 100644 index 0000000..0a2c51e --- /dev/null +++ b/grid12.css @@ -0,0 +1,913 @@ +@-ms-viewport { + width: device-width; + } + .visible-xs, + .visible-sm, + .visible-md, + .visible-lg { + display: none !important; + } + .visible-xs-block, + .visible-xs-inline, + .visible-xs-inline-block, + .visible-sm-block, + .visible-sm-inline, + .visible-sm-inline-block, + .visible-md-block, + .visible-md-inline, + .visible-md-inline-block, + .visible-lg-block, + .visible-lg-inline, + .visible-lg-inline-block { + display: none !important; + } + @media (max-width: 767px) { + .visible-xs { + display: block !important; + } + table.visible-xs { + display: table; + } + tr.visible-xs { + display: table-row !important; + } + th.visible-xs, + td.visible-xs { + display: table-cell !important; + } + } + @media (max-width: 767px) { + .visible-xs-block { + display: block !important; + } + } + @media (max-width: 767px) { + .visible-xs-inline { + display: inline !important; + } + } + @media (max-width: 767px) { + .visible-xs-inline-block { + display: inline-block !important; + } + } + @media (min-width: 768px) and (max-width: 991px) { + .visible-sm { + display: block !important; + } + table.visible-sm { + display: table; + } + tr.visible-sm { + display: table-row !important; + } + th.visible-sm, + td.visible-sm { + display: table-cell !important; + } + } + @media (min-width: 768px) and (max-width: 991px) { + .visible-sm-block { + display: block !important; + } + } + @media (min-width: 768px) and (max-width: 991px) { + .visible-sm-inline { + display: inline !important; + } + } + @media (min-width: 768px) and (max-width: 991px) { + .visible-sm-inline-block { + display: inline-block !important; + } + } + @media (min-width: 992px) and (max-width: 1199px) { + .visible-md { + display: block !important; + } + table.visible-md { + display: table; + } + tr.visible-md { + display: table-row !important; + } + th.visible-md, + td.visible-md { + display: table-cell !important; + } + } + @media (min-width: 992px) and (max-width: 1199px) { + .visible-md-block { + display: block !important; + } + } + @media (min-width: 992px) and (max-width: 1199px) { + .visible-md-inline { + display: inline !important; + } + } + @media (min-width: 992px) and (max-width: 1199px) { + .visible-md-inline-block { + display: inline-block !important; + } + } + @media (min-width: 1200px) { + .visible-lg { + display: block !important; + } + table.visible-lg { + display: table; + } + tr.visible-lg { + display: table-row !important; + } + th.visible-lg, + td.visible-lg { + display: table-cell !important; + } + } + @media (min-width: 1200px) { + .visible-lg-block { + display: block !important; + } + } + @media (min-width: 1200px) { + .visible-lg-inline { + display: inline !important; + } + } + @media (min-width: 1200px) { + .visible-lg-inline-block { + display: inline-block !important; + } + } + @media (max-width: 767px) { + .hidden-xs { + display: none !important; + } + } + @media (min-width: 768px) and (max-width: 991px) { + .hidden-sm { + display: none !important; + } + } + @media (min-width: 992px) and (max-width: 1199px) { + .hidden-md { + display: none !important; + } + } + @media (min-width: 1200px) { + .hidden-lg { + display: none !important; + } + } + .visible-print { + display: none !important; + } + @media print { + .visible-print { + display: block !important; + } + table.visible-print { + display: table; + } + tr.visible-print { + display: table-row !important; + } + th.visible-print, + td.visible-print { + display: table-cell !important; + } + } + .visible-print-block { + display: none !important; + } + @media print { + .visible-print-block { + display: block !important; + } + } + .visible-print-inline { + display: none !important; + } + @media print { + .visible-print-inline { + display: inline !important; + } + } + .visible-print-inline-block { + display: none !important; + } + @media print { + .visible-print-inline-block { + display: inline-block !important; + } + } + @media print { + .hidden-print { + display: none !important; + } + } + .container { + margin-right: auto; + margin-left: auto; + padding-left: 15px; + padding-right: 15px; + } + @media (min-width: 768px) { + .container { + width: 750px; + } + } + @media (min-width: 992px) { + .container { + width: 970px; + } + } + @media (min-width: 1200px) { + .container { + width: 1170px; + } + } + .container-fluid { + margin-right: auto; + margin-left: auto; + padding-left: 15px; + padding-right: 15px; + } + .row { + margin-left: -15px; + margin-right: -15px; + } + .col, .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { + position: relative; + min-height: 1px; + padding-left: 15px; + padding-right: 15px; + } + .col, .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 { + float: left; + } + .col-xs-12 { + width: 100%; + } + .col-xs-11 { + width: 91.66666667%; + } + .col-xs-10 { + width: 83.33333333%; + } + .col-xs-9 { + width: 75%; + } + .col-xs-8 { + width: 66.66666667%; + } + .col-xs-7 { + width: 58.33333333%; + } + .col-xs-6 { + width: 50%; + } + .col-xs-5 { + width: 41.66666667%; + } + .col-xs-4 { + width: 33.33333333%; + } + .col-xs-3 { + width: 25%; + } + .col-xs-2 { + width: 16.66666667%; + } + .col-xs-1 { + width: 8.33333333%; + } + .col-xs-pull-12 { + right: 100%; + } + .col-xs-pull-11 { + right: 91.66666667%; + } + .col-xs-pull-10 { + right: 83.33333333%; + } + .col-xs-pull-9 { + right: 75%; + } + .col-xs-pull-8 { + right: 66.66666667%; + } + .col-xs-pull-7 { + right: 58.33333333%; + } + .col-xs-pull-6 { + right: 50%; + } + .col-xs-pull-5 { + right: 41.66666667%; + } + .col-xs-pull-4 { + right: 33.33333333%; + } + .col-xs-pull-3 { + right: 25%; + } + .col-xs-pull-2 { + right: 16.66666667%; + } + .col-xs-pull-1 { + right: 8.33333333%; + } + .col-xs-pull-0 { + right: auto; + } + .col-xs-push-12 { + left: 100%; + } + .col-xs-push-11 { + left: 91.66666667%; + } + .col-xs-push-10 { + left: 83.33333333%; + } + .col-xs-push-9 { + left: 75%; + } + .col-xs-push-8 { + left: 66.66666667%; + } + .col-xs-push-7 { + left: 58.33333333%; + } + .col-xs-push-6 { + left: 50%; + } + .col-xs-push-5 { + left: 41.66666667%; + } + .col-xs-push-4 { + left: 33.33333333%; + } + .col-xs-push-3 { + left: 25%; + } + .col-xs-push-2 { + left: 16.66666667%; + } + .col-xs-push-1 { + left: 8.33333333%; + } + .col-xs-push-0 { + left: auto; + } + .col-xs-offset-12 { + margin-left: 100%; + } + .col-xs-offset-11 { + margin-left: 91.66666667%; + } + .col-xs-offset-10 { + margin-left: 83.33333333%; + } + .col-xs-offset-9 { + margin-left: 75%; + } + .col-xs-offset-8 { + margin-left: 66.66666667%; + } + .col-xs-offset-7 { + margin-left: 58.33333333%; + } + .col-xs-offset-6 { + margin-left: 50%; + } + .col-xs-offset-5 { + margin-left: 41.66666667%; + } + .col-xs-offset-4 { + margin-left: 33.33333333%; + } + .col-xs-offset-3 { + margin-left: 25%; + } + .col-xs-offset-2 { + margin-left: 16.66666667%; + } + .col-xs-offset-1 { + margin-left: 8.33333333%; + } + .col-xs-offset-0 { + margin-left: 0%; + } + @media (min-width: 768px) { + .col, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { + float: left; + } + .col-sm-12 { + width: 100%; + } + .col-sm-11 { + width: 91.66666667%; + } + .col-sm-10 { + width: 83.33333333%; + } + .col-sm-9 { + width: 75%; + } + .col-sm-8 { + width: 66.66666667%; + } + .col-sm-7 { + width: 58.33333333%; + } + .col-sm-6 { + width: 50%; + } + .col-sm-5 { + width: 41.66666667%; + } + .col-sm-4 { + width: 33.33333333%; + } + .col-sm-3 { + width: 25%; + } + .col-sm-2 { + width: 16.66666667%; + } + .col-sm-1 { + width: 8.33333333%; + } + .col-sm-pull-12 { + right: 100%; + } + .col-sm-pull-11 { + right: 91.66666667%; + } + .col-sm-pull-10 { + right: 83.33333333%; + } + .col-sm-pull-9 { + right: 75%; + } + .col-sm-pull-8 { + right: 66.66666667%; + } + .col-sm-pull-7 { + right: 58.33333333%; + } + .col-sm-pull-6 { + right: 50%; + } + .col-sm-pull-5 { + right: 41.66666667%; + } + .col-sm-pull-4 { + right: 33.33333333%; + } + .col-sm-pull-3 { + right: 25%; + } + .col-sm-pull-2 { + right: 16.66666667%; + } + .col-sm-pull-1 { + right: 8.33333333%; + } + .col-sm-pull-0 { + right: auto; + } + .col-sm-push-12 { + left: 100%; + } + .col-sm-push-11 { + left: 91.66666667%; + } + .col-sm-push-10 { + left: 83.33333333%; + } + .col-sm-push-9 { + left: 75%; + } + .col-sm-push-8 { + left: 66.66666667%; + } + .col-sm-push-7 { + left: 58.33333333%; + } + .col-sm-push-6 { + left: 50%; + } + .col-sm-push-5 { + left: 41.66666667%; + } + .col-sm-push-4 { + left: 33.33333333%; + } + .col-sm-push-3 { + left: 25%; + } + .col-sm-push-2 { + left: 16.66666667%; + } + .col-sm-push-1 { + left: 8.33333333%; + } + .col-sm-push-0 { + left: auto; + } + .col-sm-offset-12 { + margin-left: 100%; + } + .col-sm-offset-11 { + margin-left: 91.66666667%; + } + .col-sm-offset-10 { + margin-left: 83.33333333%; + } + .col-sm-offset-9 { + margin-left: 75%; + } + .col-sm-offset-8 { + margin-left: 66.66666667%; + } + .col-sm-offset-7 { + margin-left: 58.33333333%; + } + .col-sm-offset-6 { + margin-left: 50%; + } + .col-sm-offset-5 { + margin-left: 41.66666667%; + } + .col-sm-offset-4 { + margin-left: 33.33333333%; + } + .col-sm-offset-3 { + margin-left: 25%; + } + .col-sm-offset-2 { + margin-left: 16.66666667%; + } + .col-sm-offset-1 { + margin-left: 8.33333333%; + } + .col-sm-offset-0 { + margin-left: 0%; + } + } + @media (min-width: 992px) { + .col, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 { + float: left; + } + .col-md-12 { + width: 100%; + } + .col-md-11 { + width: 91.66666667%; + } + .col-md-10 { + width: 83.33333333%; + } + .col-md-9 { + width: 75%; + } + .col-md-8 { + width: 66.66666667%; + } + .col-md-7 { + width: 58.33333333%; + } + .col-md-6 { + width: 50%; + } + .col-md-5 { + width: 41.66666667%; + } + .col-md-4 { + width: 33.33333333%; + } + .col-md-3 { + width: 25%; + } + .col-md-2 { + width: 16.66666667%; + } + .col-md-1 { + width: 8.33333333%; + } + .col-md-pull-12 { + right: 100%; + } + .col-md-pull-11 { + right: 91.66666667%; + } + .col-md-pull-10 { + right: 83.33333333%; + } + .col-md-pull-9 { + right: 75%; + } + .col-md-pull-8 { + right: 66.66666667%; + } + .col-md-pull-7 { + right: 58.33333333%; + } + .col-md-pull-6 { + right: 50%; + } + .col-md-pull-5 { + right: 41.66666667%; + } + .col-md-pull-4 { + right: 33.33333333%; + } + .col-md-pull-3 { + right: 25%; + } + .col-md-pull-2 { + right: 16.66666667%; + } + .col-md-pull-1 { + right: 8.33333333%; + } + .col-md-pull-0 { + right: auto; + } + .col-md-push-12 { + left: 100%; + } + .col-md-push-11 { + left: 91.66666667%; + } + .col-md-push-10 { + left: 83.33333333%; + } + .col-md-push-9 { + left: 75%; + } + .col-md-push-8 { + left: 66.66666667%; + } + .col-md-push-7 { + left: 58.33333333%; + } + .col-md-push-6 { + left: 50%; + } + .col-md-push-5 { + left: 41.66666667%; + } + .col-md-push-4 { + left: 33.33333333%; + } + .col-md-push-3 { + left: 25%; + } + .col-md-push-2 { + left: 16.66666667%; + } + .col-md-push-1 { + left: 8.33333333%; + } + .col-md-push-0 { + left: auto; + } + .col-md-offset-12 { + margin-left: 100%; + } + .col-md-offset-11 { + margin-left: 91.66666667%; + } + .col-md-offset-10 { + margin-left: 83.33333333%; + } + .col-md-offset-9 { + margin-left: 75%; + } + .col-md-offset-8 { + margin-left: 66.66666667%; + } + .col-md-offset-7 { + margin-left: 58.33333333%; + } + .col-md-offset-6 { + margin-left: 50%; + } + .col-md-offset-5 { + margin-left: 41.66666667%; + } + .col-md-offset-4 { + margin-left: 33.33333333%; + } + .col-md-offset-3 { + margin-left: 25%; + } + .col-md-offset-2 { + margin-left: 16.66666667%; + } + .col-md-offset-1 { + margin-left: 8.33333333%; + } + .col-md-offset-0 { + margin-left: 0%; + } + } + @media (min-width: 1200px) { + .col, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 { + float: left; + } + .col-lg-12 { + width: 100%; + } + .col-lg-11 { + width: 91.66666667%; + } + .col-lg-10 { + width: 83.33333333%; + } + .col-lg-9 { + width: 75%; + } + .col-lg-8 { + width: 66.66666667%; + } + .col-lg-7 { + width: 58.33333333%; + } + .col-lg-6 { + width: 50%; + } + .col-lg-5 { + width: 41.66666667%; + } + .col-lg-4 { + width: 33.33333333%; + } + .col-lg-3 { + width: 25%; + } + .col-lg-2 { + width: 16.66666667%; + } + .col-lg-1 { + width: 8.33333333%; + } + .col-lg-pull-12 { + right: 100%; + } + .col-lg-pull-11 { + right: 91.66666667%; + } + .col-lg-pull-10 { + right: 83.33333333%; + } + .col-lg-pull-9 { + right: 75%; + } + .col-lg-pull-8 { + right: 66.66666667%; + } + .col-lg-pull-7 { + right: 58.33333333%; + } + .col-lg-pull-6 { + right: 50%; + } + .col-lg-pull-5 { + right: 41.66666667%; + } + .col-lg-pull-4 { + right: 33.33333333%; + } + .col-lg-pull-3 { + right: 25%; + } + .col-lg-pull-2 { + right: 16.66666667%; + } + .col-lg-pull-1 { + right: 8.33333333%; + } + .col-lg-pull-0 { + right: auto; + } + .col-lg-push-12 { + left: 100%; + } + .col-lg-push-11 { + left: 91.66666667%; + } + .col-lg-push-10 { + left: 83.33333333%; + } + .col-lg-push-9 { + left: 75%; + } + .col-lg-push-8 { + left: 66.66666667%; + } + .col-lg-push-7 { + left: 58.33333333%; + } + .col-lg-push-6 { + left: 50%; + } + .col-lg-push-5 { + left: 41.66666667%; + } + .col-lg-push-4 { + left: 33.33333333%; + } + .col-lg-push-3 { + left: 25%; + } + .col-lg-push-2 { + left: 16.66666667%; + } + .col-lg-push-1 { + left: 8.33333333%; + } + .col-lg-push-0 { + left: auto; + } + .col-lg-offset-12 { + margin-left: 100%; + } + .col-lg-offset-11 { + margin-left: 91.66666667%; + } + .col-lg-offset-10 { + margin-left: 83.33333333%; + } + .col-lg-offset-9 { + margin-left: 75%; + } + .col-lg-offset-8 { + margin-left: 66.66666667%; + } + .col-lg-offset-7 { + margin-left: 58.33333333%; + } + .col-lg-offset-6 { + margin-left: 50%; + } + .col-lg-offset-5 { + margin-left: 41.66666667%; + } + .col-lg-offset-4 { + margin-left: 33.33333333%; + } + .col-lg-offset-3 { + margin-left: 25%; + } + .col-lg-offset-2 { + margin-left: 16.66666667%; + } + .col-lg-offset-1 { + margin-left: 8.33333333%; + } + .col-lg-offset-0 { + margin-left: 0%; + } + } + .clearfix, + .clearfix:before, + .clearfix:after, + .container:before, + .container:after, + .container-fluid:before, + .container-fluid:after, + .row:before, + .row:after { + content: " "; + display: table; + } + .clearfix:after, + .container:after, + .container-fluid:after, + .row:after { + clear: both; + } + .center-block { + display: block; + margin-left: auto; + margin-right: auto; + } + .pull-right { + float: right !important; + } + .pull-left { + float: left !important; + } + *, + *:before, + *:after { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } \ No newline at end of file diff --git a/index.html b/index.html index f84bd14..46da622 100644 --- a/index.html +++ b/index.html @@ -2,6 +2,7 @@ Thirtify + diff --git a/partials/album.html b/partials/album.html index bd8d6db..56bf88e 100644 --- a/partials/album.html +++ b/partials/album.html @@ -16,7 +16,7 @@ POPULARITY - + {{t.track_number}} diff --git a/partials/result.html b/partials/result.html new file mode 100644 index 0000000..856c92a --- /dev/null +++ b/partials/result.html @@ -0,0 +1,19 @@ +

Showing results for {{query}} in {{model]}

+ +

{{model.toUpperCase()}}S

+ +
+
+

PLAYLISTS

+ +
+
\ No newline at end of file diff --git a/partials/searchresults.html b/partials/searchresults.html index 59d297a..283b02c 100644 --- a/partials/searchresults.html +++ b/partials/searchresults.html @@ -1,12 +1,24 @@ -

Showing results for {{query}}

+

Showing results for '{{query}}'

-
-
- -
    -

    PLAYLISTS

    -
  • - +
    +
    +

    PLAYLISTS

    + +
    +
    +
      +

      ARTISTS

      +
    • +

      @@ -15,7 +27,64 @@

      PLAYLISTS

    +
    +
    + +
    +
    + +
    +
    +

    EPISODES

    + + + + + + + + + + + + + + + +
    EPISODESHOWDURATION
    + + + {{t.name}} + + {{t.show.name}} + + {{ t.duration_ms | displaytime }} +
    +
    +

    TRACKS

    @@ -53,4 +122,4 @@

    TRACKS

    -
    +
    diff --git a/services/api.js b/services/api.js index 0162a06..6f3ec44 100644 --- a/services/api.js +++ b/services/api.js @@ -30,7 +30,7 @@ // Ready player.addListener('ready', ({ device_id }) => { window.currentSpotifyDeviceId = device_id - + console.log('Ready with Device ID', window.currentSpotifyDeviceId); }); @@ -377,13 +377,16 @@ playTracks: function (uris) { var ret = $q.defer(); - $http.put(baseUrl + '/me/player/player/play?device_id=' + window.currentSpotifyDeviceId + '/tracks', { + $http({ + method: 'PUT', + url: baseUrl + '/me/player/play?device_id=' + window.currentSpotifyDeviceId, headers: { + 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + Auth.getAccessToken() }, - body: JSON.stringify({ - uris: [uris] - }) + data: { + uris: uris + } }).success(function(r) { console.log('got album tracks', r); ret.resolve(r); @@ -466,7 +469,7 @@ getSearchResults: function(query) { var ret = $q.defer(); - $http.get(baseUrl + '/search?type=track,playlist&q=' + encodeURIComponent(query) + '&market=from_token', { + $http.get(baseUrl + '/search?type=track,playlist,album,artist,show,episode&q=' + encodeURIComponent(query) + '&market=from_token', { headers: { 'Authorization': 'Bearer ' + Auth.getAccessToken() } diff --git a/services/playback.js b/services/playback.js index acda0ef..b7643ea 100644 --- a/services/playback.js +++ b/services/playback.js @@ -66,13 +66,13 @@ API.playTracks([trackuri]).then(function(trackdata) { console.log('playback got track', trackdata); - createAndPlayAudio(trackdata.preview_url, function() { - _trackdata = trackdata; - _progress = 0; - $rootScope.$emit('playerchanged'); - $rootScope.$emit('trackprogress'); - enableTick(); - }); + + _trackdata = trackdata; + _progress = 0; + $rootScope.$emit('playerchanged'); + $rootScope.$emit('trackprogress'); + enableTick(); + }); }, stopPlaying: function() { diff --git a/style.css b/style.css index 0c6d451..7a766b3 100644 --- a/style.css +++ b/style.css @@ -330,11 +330,15 @@ generic-header { } .mainview > .ng-scope { + + +} + +generic-header > div { background: -moz-linear-gradient(top, rgba(255,255,255,0.15) 0%, rgba(255,255,255,0) 20%); /* FF3.6-15 */ background: var(--background-color), -webkit-linear-gradient(top, rgba(255,255,255,0.15) 0%,rgba(255,255,255,0) 10%); /* Chrome10-25,Safari5.1-6 */ -background: linear-gradient(to bottom, rgba(255,255,255,0.15) 0%,rgba(255,255,255,0) 8%), var(--background-color); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */ +background: linear-gradient(to bottom, rgba(255,255,255,0.15) 0%,rgba(255,255,255,0) 100%), var(--background-color); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#40ffffff', endColorstr='#00ffffff',GradientType=0 ); /* IE6-9 */ - } .mainview a { padding: 0pt; From 1e6465c969a49eabc174714a47443506f05b8d12 Mon Sep 17 00:00:00 2001 From: Alexander Forselius Date: Thu, 6 Sep 2018 15:39:00 +0200 Subject: [PATCH 03/12] T --- controllers/artist.js | 6 + controllers/episode.js | 0 controllers/results.js | 47 +++++ controllers/searchresults.js | 16 +- partials/artist.html | 16 ++ partials/{result.html => results.html} | 0 partials/searchresults.html | 257 +++++++++++++------------ services/playback.js | 7 +- style.css | 16 ++ 9 files changed, 237 insertions(+), 128 deletions(-) create mode 100644 controllers/episode.js create mode 100644 controllers/results.js rename partials/{result.html => results.html} (100%) diff --git a/controllers/artist.js b/controllers/artist.js index 7689eca..503523d 100644 --- a/controllers/artist.js +++ b/controllers/artist.js @@ -37,6 +37,12 @@ }); }); + API.findShows($scope.artist.name).then(function (results) { + $scope.shows = results.shows.items.filter((obj) => { + return obj.publisher.indexOf($scope.artist.name) !== -1 + }) + }) + API.getArtistAlbums($scope.artist, Auth.getUserCountry()).then(function(albums) { console.log('got artist albums', albums); $scope.albums = []; diff --git a/controllers/episode.js b/controllers/episode.js new file mode 100644 index 0000000..e69de29 diff --git a/controllers/results.js b/controllers/results.js new file mode 100644 index 0000000..7dce59a --- /dev/null +++ b/controllers/results.js @@ -0,0 +1,47 @@ +(function() { + + var module = angular.module('PlayerApp'); + + module.controller('ResultsController', function($scope, API, $location, PlayQueue, $routeParams) { + $scope.query = $location.search().q || ''; + + API.getSearchResults($scope.query).then(function(results) { + console.log('got search results', results); + $scope.objects = results[$scope.model + 's'].items; + + // find out if they are in the user's collection + var ids = $scope.tracks.map(function(track) { + return track.id; + }); + + API.containsUserTracks(ids).then(function(results) { + results.forEach(function(result, index) { + $scope.tracks[index].inYourMusic = result; + }); + }); + + }); + + $scope.play = function(trackuri) { + var trackuris = $scope.tracks.map(function(track) { + return track.uri; + }); + PlayQueue.clear(); + PlayQueue.enqueueList(trackuris); + PlayQueue.playFrom(trackuris.indexOf(trackuri)); + }; + + $scope.toggleFromYourMusic = function(index) { + if ($scope.tracks[index].inYourMusic) { + API.removeFromMyTracks([$scope.tracks[index].id]).then(function(response) { + $scope.tracks[index].inYourMusic = false; + }); + } else { + API.addToMyTracks([$scope.tracks[index].id]).then(function(response) { + $scope.tracks[index].inYourMusic = true; + }); + } + }; + }); + +})(); diff --git a/controllers/searchresults.js b/controllers/searchresults.js index e167094..3096020 100644 --- a/controllers/searchresults.js +++ b/controllers/searchresults.js @@ -4,16 +4,20 @@ module.controller('SearchResultsController', function($scope, API, $location, PlayQueue, $routeParams) { $scope.query = $location.search().q || ''; + $scope.type = $location.search().type || null; $scope.tracks = []; API.getSearchResults($scope.query).then(function(results) { console.log('got search results', results); - $scope.tracks = results.tracks.items; - $scope.playlists = results.playlists.items; - $scope.artists = results.artists.items; - $scope.albums = results.albums.items; - $scope.shows = results.shows.items; - $scope.episodes = results.episodes.items; + if ($scope.type) { + $scope.objects = results[$scope.type + 's'].items; + } + $scope.tracks = results.tracks.items.slice(0, 5); + $scope.playlists = results.playlists.items.slice(0, 5); + $scope.artists = results.artists.items.slice(0, 5); + $scope.albums = results.albums.items.slice(0, 5); + $scope.shows = results.shows.items.slice(0, 5); + $scope.episodes = results.episodes.items.slice(0, 5); // find out if they are in the user's collection var ids = $scope.tracks.map(function(track) { diff --git a/partials/artist.html b/partials/artist.html index 7540edf..ed99ef7 100644 --- a/partials/artist.html +++ b/partials/artist.html @@ -74,6 +74,22 @@

    Appears on


    +
    +

    Shows featuring '{{data.name}}'

    + +
    +
    +
    + +
    + + + {{release_year}} + · + + + + Total {{total_duration | displaytime}} · {{data.tracks.total}} songs · {{ total_duration | displaytime }} + +
\ No newline at end of file diff --git a/partials/playlist.html b/partials/playlist.html index ec0f66c..f22446e 100644 --- a/partials/playlist.html +++ b/partials/playlist.html @@ -1,7 +1,7 @@ - +
@@ -23,13 +23,13 @@ - - - - diff --git a/partials/publisher.html b/partials/publisher.html index 7594b13..b501223 100644 --- a/partials/publisher.html +++ b/partials/publisher.html @@ -1,16 +1,17 @@ +
+

SHOWS

+ -

SHOWS

- - -
+
+
\ No newline at end of file diff --git a/partials/recommendations.html b/partials/recommendations.html new file mode 100644 index 0000000..2d9aa2f --- /dev/null +++ b/partials/recommendations.html @@ -0,0 +1,42 @@ +
{{t.track.artists[0].name}} + {{ t.track.duration_ms | displaytime }} {{t.track.album.name}} + {{t.added_at | timeago}} @@ -41,6 +41,7 @@
+ diff --git a/partials/label.html b/partials/label.html new file mode 100644 index 0000000..11c49c5 --- /dev/null +++ b/partials/label.html @@ -0,0 +1,146 @@ + +
+ + + + +
+
+
+
+

Popular tracks

+ + + + + + + + + + + + + + + + + + +
#SONGTIME
{{$index + 1}} + + {{t.name}}{{t.duration_ms | displaytime}}
+
+
+

Related artists

+ Related artists could not be loaded at this moment +
+
+
+
+ +
+

Shows featuring '{{data.name}}'

+ +
+
+
+
+

Artists

+ +
+
+
+ +
+

Albums

+ +
+
+
+ +
+

Singles

+ +
+
+
+ +
+

Appears on

+ +
+
+
+
+ diff --git a/partials/playlist.html b/partials/playlist.html index f22446e..3637393 100644 --- a/partials/playlist.html +++ b/partials/playlist.html @@ -1,4 +1,4 @@ - +
@@ -21,19 +21,19 @@ {{t.track.name}}
- {{t.track.artists[0].name}} + {{t.track.artists[0].name}} {{ t.track.duration_ms | displaytime }} - {{t.track.album.name}} + {{t.track.album.name}} + {{t.added_at | timeago}} - {{t.added_by.id}} + + {{t.added_by.id}}
+ + + + + + + + + + + + + + + + + + + + + + +
TRACKARTISTTIMEALBUMADDEDUSER
+ + + + + {{t.name}} + + {{t.artists[0].name}} + + {{t.album.name}} + + {{ t.track.duration_ms | displaytime }} + + {{t.track.album.name}} + + {{t.added_at | timeago}} + + {{t.added_by.id}} +
\ No newline at end of file diff --git a/partials/results.html b/partials/results.html index 856c92a..2ad792e 100644 --- a/partials/results.html +++ b/partials/results.html @@ -4,14 +4,14 @@

{{model.toUpperCase()}}S

-

PLAYLISTS

+

PLAYLISTS

diff --git a/partials/searchresults.html b/partials/searchresults.html index 81aec6c..c7d0bf1 100644 --- a/partials/searchresults.html +++ b/partials/searchresults.html @@ -1,142 +1,142 @@ - -
-

Showing results for '{{query}}' in {{type}}s

- -
- + +
+
+
+ +
+
+
+
+

PLAYLISTS

+ +
+
+

ARTISTS

+ +
+
+ +
+
+ +
+
+

EPISODES

+ + + + + + + + + + + + + + + +
EPISODESHOWDURATION
+ + + {{t.name}} + + {{t.show.name}} + + {{ t.duration_ms | displaytime }} +
+
-
-

Showing results for '{{query}}'

-
-

PLAYLISTS

- -
-
-

ARTISTS

- -
-
- -
-
- -
-
-

EPISODES

- - - - - - - - - - - - - - - -
EPISODESHOWDURATION
- - - {{t.name}} - - {{t.show.name}} - - {{ t.duration_ms | displaytime }} -
-
- -
-

TRACKS

- - - - - - - - - - - - - - - - - - - -
SONGARTISTALBUMTIMEPOPULARITY
- - - {{t.name}} - - {{t.artists[0].name}} - - {{t.album.name}} - - {{ t.duration_ms | displaytime }} - -
-
-
-
-
+
+

TRACKS

+ + + + + + + + + + + + + + + + + + + +
SONGARTISTALBUMTIMEPOPULARITY
+ + + {{t.name}} + + {{t.artists[0].name}} + + {{t.album.name}} + + {{ t.duration_ms | displaytime }} + +
+
+
+
+
+
diff --git a/partials/show.html b/partials/show.html index 503cc42..99c148a 100644 --- a/partials/show.html +++ b/partials/show.html @@ -1,4 +1,5 @@ - + +

Episodes

@@ -9,7 +10,7 @@

Episodes

- - @@ -34,6 +34,7 @@

Episodes


+ diff --git a/partials/user.html b/partials/user.html index fb454d4..f416c81 100644 --- a/partials/user.html +++ b/partials/user.html @@ -4,11 +4,11 @@

Public Playlists

- +

- {{t.name}} + {{t.name}}

diff --git a/partials/usertracks.html b/partials/usertracks.html index 73018a1..3a74730 100644 --- a/partials/usertracks.html +++ b/partials/usertracks.html @@ -16,11 +16,11 @@ {{t.track.name}}
+
@@ -18,14 +19,13 @@

Episodes

 - +

{{t.name}} - -

Published {{t.release_date | timeago}}

+

{{t.description}}

 +

Published {{t.release_date | timeago}}
- {{t.track.artists[0].name}} + {{t.track.artists[0].name}} {{t.track.duration_ms | displaytime}} - {{t.track.album.name}} + {{t.track.album.name}} {{t.added_at | timeago}} diff --git a/server.py b/server.py new file mode 100644 index 0000000..a7a164b --- /dev/null +++ b/server.py @@ -0,0 +1,38 @@ +#!/usr/bin/env python +""" +Modification of `python -m SimpleHTTPServer` with a fallback to /index.html +on requests for non-existing files. +This is useful when serving a static single page application using the HTML5 +history API. +https://gist.github.com/martijnvermaat/4bec9bcc37d965e43879 +""" + + +import os +import sys +import urlparse +import SimpleHTTPServer +import BaseHTTPServer + + +class Handler(SimpleHTTPServer.SimpleHTTPRequestHandler): + def do_GET(self): + urlparts = urlparse.urlparse(self.path) + request_file_path = urlparts.path.strip('/') + + if not os.path.exists(request_file_path): + self.path = 'index.html' + + return SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self) + + +host = '0.0.0.0' +try: + port = int(sys.argv[1]) +except IndexError: + port = 8000 +httpd = BaseHTTPServer.HTTPServer((host, port), Handler) + + +print 'Serving HTTP on %s port %d ...' % (host, port) +httpd.serve_forever() \ No newline at end of file diff --git a/services/api.js b/services/api.js index fe87f03..815bcae 100644 --- a/services/api.js +++ b/services/api.js @@ -609,6 +609,39 @@ return ret.promise; }, + getRecommendations(input) { + console.log(input) + var ret = $q.defer(); + $http.get( + baseUrl + '/recommendations?' + $.param(input), + { + headers: { 'Authorization': 'Bearer ' + Auth.getAccessToken() + } + }).success(function(r) { + console.log('followed playlist', r); + ret.resolve(r); + }).error(function(err) { + console.log('failed to follow playlist', err); + ret.reject(err); + }); + + return ret.promise; + }, + getAudioAnalysisForTrack(identifier) { + var ret = $q.defer(); + $http.get( + baseUrl + '/audio-analysis/' + encodeURIComponent(identifier), + { headers: { 'Authorization': 'Bearer ' + Auth.getAccessToken() } + }).success(function(r) { + console.log('followed playlist', r); + ret.resolve(r); + }).error(function(err) { + console.log('failed to follow playlist', err); + ret.reject(err); + }); + + return ret.promise; + }, followPlaylist: function(username, playlist) { var ret = $q.defer(); @@ -724,7 +757,6 @@ }); return ret.promise; }, - }; }); diff --git a/style.css b/style.css index 684a3cd..e58ea38 100644 --- a/style.css +++ b/style.css @@ -2,6 +2,7 @@ --background-color: #121314; --color: #fefefe; --primary-color: #1db954; + --vibrant-color: rgba(255,255,255,0.15); } @@ -13,7 +14,7 @@ body { padding: 0; border: 0; font-family: 'Open Sans', sans-serif; - font-size: 8pt; + font-size: 10pt; font-weight: 300; overflow: hidden; } @@ -54,7 +55,7 @@ h2 { margin: 0 0 10px 0; } -h3 { +h3, summary { font-family: 'Open Sans', sans-serif; font-weight: 300; font-size: 15pt; @@ -113,7 +114,13 @@ hr { box-sizing: border-box; padding: 7px; } - +tab-bar { + display: block; + margin-bottom: 25pt; +} +tabbar-tab { + padding-bottom: 12pt; +} .topgroup .searchbox input { border: 0; padding: 5px 10px; @@ -130,11 +137,18 @@ hr { padding: 12px; text-align: right; } +h3, summary { + font-weight: bold; + color: white; +} +li, ul { + list-style-type: none; +} .topgroup .titlebox { position: absolute; - left: 150px; - right: 150px; + left: 350px; + right: 350px; top: 0px; text-align: center; padding: 12px; @@ -331,14 +345,19 @@ generic-header { .mainview > .ng-scope { +} +.cover { + box-shadow: 0pt 0pt 12pt rgba(0, 0, 0, .8); } generic-header { - background: -moz-linear-gradient(top, rgba(255,255,255,0.15) 0%, rgba(255,255,255,0) 20%); /* FF3.6-15 */ -background: var(--background-color), -webkit-linear-gradient(top, rgba(255,255,255,0.15) 0%,rgba(255,255,255,0) 10%); /* Chrome10-25,Safari5.1-6 */ -background: linear-gradient(to bottom, rgba(255,255,255,0.15) 0%,rgba(255,255,255,0) 100%), var(--background-color); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#40ffffff', endColorstr='#00ffffff',GradientType=0 ); /* IE6-9 */ + background: -moz-linear-gradient(top, var(--vibrant-color) 0%, transparent 100%); /* FF3.6-15 */ + background: -webkit-linear-gradient(top, var(--vibrant-color) 0%, transparent 100%); /* Chrome10-25,Safari5.1-6 */ + background: linear-gradient(to bottom, var(--vibrant-color) 0%, transparent 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#40ffffff', endColorstr='#00ffffff',GradientType=0 ); /* IE6-9 */ + transition: background 0.5s; } + .mainview a { padding: 0pt; color: #fff; @@ -385,10 +404,14 @@ div.centered div.inner { a.button { display: inline-block; text-align: center; - padding: 5px 20px; + padding: 5px 30px; border-radius: 50px; + font-size: 12pt; + margin-right: 12pt; + } + a.button.green { background-color: var(--primary-color); color: #fff; @@ -530,9 +553,12 @@ table tr.playing { } table tr td { - font-size: 9pt; + font-size: 10pt; border-top: 1px solid #393b40; padding: 4px 10px 4px 0; + + padding-top: 12pt; + padding-bottom: 12pt; } table tr td i { @@ -566,6 +592,16 @@ ul.albums, ul.playlists, ul.genres { border: 0; clear: both; } +tabbar-tab { + text-transform: uppercase; + margin-right: 12pt; + font-size: 12pt; + cursor: hand; +} +tabbar-tab.active { + color: white; + border-bottom: 2pt solid var(--primary-color); +} ul.albums li, ul.playlists li, ul.genres li { float: left; @@ -575,6 +611,12 @@ ul.albums li, ul.playlists li, ul.genres li { margin: 0 10px 10px 0; /*background-color: #393b40;*/ } +section { + display: none; +} +section#overview { + display: block; +} ul.albums li responsive-cover, ul.playlists li responsive-cover, ul.genres li img { width: 160px; @@ -665,14 +707,14 @@ button { background-color: #1c1c1f; } -responsive-cover { +responsive-cover, .button { transition: transform 0.5; } -responsive-cover:hover { - transform: scale(1.05); +responsive-cover:hover, .button:hover { + transform: scale(1.1); } -responsive-cover:active { - transform: scale(0.90); +responsive-cover:active, .button:active { + transform: scale(0.95); } From a17b7165d337ba06658fbad619d5c7a2dd2643bf Mon Sep 17 00:00:00 2001 From: Alexander Forselius Date: Fri, 7 Sep 2018 01:27:13 +0200 Subject: [PATCH 07/12] Lot of fun improvements --- app.js | 8 +++ controllers/country.js | 101 ++++++++++++++++++++++++++++ controllers/show.js | 4 +- controllers/year.js | 101 ++++++++++++++++++++++++++++ index.html | 2 + partials/album.html | 10 +-- partials/artist.html | 2 +- partials/browse.html | 2 +- partials/country.html | 146 +++++++++++++++++++++++++++++++++++++++++ partials/playlist.html | 16 ++--- partials/show.html | 6 +- partials/user.html | 2 +- partials/year.html | 146 +++++++++++++++++++++++++++++++++++++++++ style.css | 6 +- 14 files changed, 530 insertions(+), 22 deletions(-) create mode 100644 controllers/country.js create mode 100644 partials/country.html diff --git a/app.js b/app.js index 949ddf6..a1cb736 100644 --- a/app.js +++ b/app.js @@ -78,6 +78,14 @@ templateUrl: 'partials/publisher.html', controller: 'PublisherController' }). + when('/years?/:identifier', { + templateUrl: 'partials/year.html', + controller: 'YearController' + }). + when('/country/:identifier', { + templateUrl: 'partials/country.html', + controller: 'CountryController' + }). otherwise({ redirectTo: '/' }); diff --git a/controllers/country.js b/controllers/country.js new file mode 100644 index 0000000..8648f8b --- /dev/null +++ b/controllers/country.js @@ -0,0 +1,101 @@ +(function() { + + var module = angular.module('PlayerApp'); + + module.controller('CountryController', function($scope, $rootScope, API, PlayQueue, $routeParams, Auth) { + $scope.identifier = $routeParams.identifier; + $scope.data = { + id: $scope.identifier, + name: $scope.identifier, + type: 'country', + images: [] + } + $scope.discog = []; + $scope.albums = []; + $scope.singles = []; + $scope.appearson = []; + $scope.artists = [] + + $scope.currenttrack = PlayQueue.getCurrent(); + $scope.isFollowing = false; + $scope.isFollowHovered = false; + $rootScope.$on('playqueuechanged', function() { + $scope.currenttrack = PlayQueue.getCurrent(); + }); + + + document.documentElement.style.setProperty('--vibrant-color','#88888888') + + + + API.getSearchResults('country:' + $scope.identifier, Auth.getUserCountry()).then(function(results) { + console.log('got year', $scope.identifier); + $scope.toptracks = results.tracks.items; + let albums = results.albums + let artists = results.artists + var ids = $scope.toptracks.map(function(track) { + return track.id; + }); + albums.items.forEach(function(album) { + console.log(album); + if (album.album_type == 'album') { + $scope.albums.push(album); + } + if (album.album_type == 'single') { + $scope.singles.push(album); + } + if (album.album_type == 'appears-on') { + $scope.appearson.push(album); + } + }) + $scope.artists = artists.items + + }); + + $scope.playtoptrack = function(trackuri) { + var trackuris = $scope.toptracks.map(function(track) { + return track.uri; + }); + PlayQueue.clear(); + PlayQueue.enqueueList(trackuris); + PlayQueue.playFrom(trackuris.indexOf(trackuri)); + }; + + $scope.playall = function(trackuri) { + var trackuris = $scope.toptracks.map(function(track) { + return track.uri; + }); + PlayQueue.clear(); + PlayQueue.enqueueList(trackuris); + PlayQueue.playFrom(0); + }; + + $scope.follow = function(isFollowing) { + if (isFollowing) { + API.unfollow($scope.artist, "artist").then(function() { + $scope.isFollowing = false; + $scope.data.followers.total--; + }); + } else { + API.follow($scope.artist, "artist").then(function() { + $scope.isFollowing = true; + $scope.data.followers.total++; + }); + } + }; + + $scope.toggleFromYourMusic = function(index) { + if ($scope.toptracks[index].inYourMusic) { + API.removeFromMyTracks([$scope.toptracks[index].id]).then(function(response) { + $scope.toptracks[index].inYourMusic = false; + }); + } else { + API.addToMyTracks([$scope.toptracks[index].id]).then(function(response) { + $scope.toptracks[index].inYourMusic = true; + }); + } + }; + + }); + +})(); diff --git a/controllers/show.js b/controllers/show.js index b213e3e..d6be2a3 100644 --- a/controllers/show.js +++ b/controllers/show.js @@ -103,7 +103,7 @@ $scope.play = function(episodeuri) { var episodeuris = $scope.episodes.map(function(episode) { - return episode.episode.uri; + return episode.uri; }); PlayQueue.clear(); PlayQueue.enqueueList(episodeuris); @@ -112,7 +112,7 @@ $scope.playall = function() { var episodeuris = $scope.episodes.map(function(episode) { - return episode.episode.uri; + return episode.uri; }); PlayQueue.clear(); PlayQueue.enqueueList(episodeuris); diff --git a/controllers/year.js b/controllers/year.js index e69de29..f605468 100644 --- a/controllers/year.js +++ b/controllers/year.js @@ -0,0 +1,101 @@ +(function() { + + var module = angular.module('PlayerApp'); + + module.controller('YearController', function($scope, $rootScope, API, PlayQueue, $routeParams, Auth) { + $scope.identifier = $routeParams.identifier; + $scope.data = { + id: $scope.identifier, + name: $scope.identifier, + type: 'year', + images: [] + } + $scope.discog = []; + $scope.albums = []; + $scope.singles = []; + $scope.appearson = []; + $scope.artists = [] + + $scope.currenttrack = PlayQueue.getCurrent(); + $scope.isFollowing = false; + $scope.isFollowHovered = false; + $rootScope.$on('playqueuechanged', function() { + $scope.currenttrack = PlayQueue.getCurrent(); + }); + + + document.documentElement.style.setProperty('--vibrant-color','#88888888') + + + + API.getSearchResults('year:' + $scope.identifier, Auth.getUserCountry()).then(function(results) { + console.log('got year', $scope.identifier); + $scope.toptracks = results.tracks.items; + let albums = results.albums + let artists = results.artists + var ids = $scope.toptracks.map(function(track) { + return track.id; + }); + albums.items.forEach(function(album) { + console.log(album); + if (album.album_type == 'album') { + $scope.albums.push(album); + } + if (album.album_type == 'single') { + $scope.singles.push(album); + } + if (album.album_type == 'appears-on') { + $scope.appearson.push(album); + } + }) + $scope.artists = artists.items + + }); + + $scope.playtoptrack = function(trackuri) { + var trackuris = $scope.toptracks.map(function(track) { + return track.uri; + }); + PlayQueue.clear(); + PlayQueue.enqueueList(trackuris); + PlayQueue.playFrom(trackuris.indexOf(trackuri)); + }; + + $scope.playall = function(trackuri) { + var trackuris = $scope.toptracks.map(function(track) { + return track.uri; + }); + PlayQueue.clear(); + PlayQueue.enqueueList(trackuris); + PlayQueue.playFrom(0); + }; + + $scope.follow = function(isFollowing) { + if (isFollowing) { + API.unfollow($scope.artist, "artist").then(function() { + $scope.isFollowing = false; + $scope.data.followers.total--; + }); + } else { + API.follow($scope.artist, "artist").then(function() { + $scope.isFollowing = true; + $scope.data.followers.total++; + }); + } + }; + + $scope.toggleFromYourMusic = function(index) { + if ($scope.toptracks[index].inYourMusic) { + API.removeFromMyTracks([$scope.toptracks[index].id]).then(function(response) { + $scope.toptracks[index].inYourMusic = false; + }); + } else { + API.addToMyTracks([$scope.toptracks[index].id]).then(function(response) { + $scope.toptracks[index].inYourMusic = true; + }); + } + }; + + }); + +})(); diff --git a/index.html b/index.html index 57ca788..188b0f5 100644 --- a/index.html +++ b/index.html @@ -29,6 +29,8 @@ + + diff --git a/partials/album.html b/partials/album.html index fe459c2..fc1de93 100644 --- a/partials/album.html +++ b/partials/album.html @@ -36,17 +36,17 @@
-
- -
+
+
+

({{c.type}}) {{c.text}}

More by '{{data.artists[0].name}}'

    -
  • +
  • - +

    {{t.name}} diff --git a/partials/artist.html b/partials/artist.html index 185f03d..6cc99a6 100644 --- a/partials/artist.html +++ b/partials/artist.html @@ -19,7 +19,7 @@

    Popular tracks

    - + {{$index + 1}} diff --git a/partials/browse.html b/partials/browse.html index 6bd9b3a..3968419 100644 --- a/partials/browse.html +++ b/partials/browse.html @@ -11,7 +11,7 @@

    {{message}}

      -
    • +
    • diff --git a/partials/country.html b/partials/country.html new file mode 100644 index 0000000..11c49c5 --- /dev/null +++ b/partials/country.html @@ -0,0 +1,146 @@ + +
      + + + + +
      +
      +
      +
      +

      Popular tracks

      + + + + + + + + + + + + + + + + + + +
      #SONGTIME
      {{$index + 1}} + + {{t.name}}{{t.duration_ms | displaytime}}
      +
      +
      +

      Related artists

      + Related artists could not be loaded at this moment +
      +
      +
      +
      + +
      +

      Shows featuring '{{data.name}}'

      + +
      +
      +
      +
      +

      Artists

      + +
      +
      +
      + +
      +

      Albums

      + +
      +
      +
      + +
      +

      Singles

      + +
      +
      +
      + +
      +

      Appears on

      + +
      +
      +
      +
      + diff --git a/partials/playlist.html b/partials/playlist.html index 3637393..f65c06e 100644 --- a/partials/playlist.html +++ b/partials/playlist.html @@ -14,25 +14,25 @@ - + - - {{t.track.name}} + + {{t.track.name}} - + {{t.track.artists[0].name}} - + {{ t.track.duration_ms | displaytime }} - + {{t.track.album.name}} - + {{t.added_at | timeago}} - + {{t.added_by.id}} diff --git a/partials/show.html b/partials/show.html index 99c148a..f2f0f05 100644 --- a/partials/show.html +++ b/partials/show.html @@ -9,7 +9,7 @@

      Episodes

      - +
      @@ -18,8 +18,8 @@

      Episodes

      - -

      + +

      {{t.name}}

      {{t.description}}

      diff --git a/partials/user.html b/partials/user.html index f416c81..7db4ff0 100644 --- a/partials/user.html +++ b/partials/user.html @@ -1,4 +1,4 @@ - +

      Public Playlists

      diff --git a/partials/year.html b/partials/year.html index e69de29..11c49c5 100644 --- a/partials/year.html +++ b/partials/year.html @@ -0,0 +1,146 @@ + +
      + + + + +
      +
      +
      +
      +

      Popular tracks

      + + + + + + + + + + + + + + + + + + +
      #SONGTIME
      {{$index + 1}} + + {{t.name}}{{t.duration_ms | displaytime}}
      +
      +
      +

      Related artists

      + Related artists could not be loaded at this moment +
      +
      +
      +
      + +
      +

      Shows featuring '{{data.name}}'

      + +
      +
      +
      +
      +

      Artists

      + +
      +
      +
      + +
      +

      Albums

      + +
      +
      +
      + +
      +

      Singles

      + +
      +
      +
      + +
      +

      Appears on

      + +
      +
      +
      +
      + diff --git a/style.css b/style.css index e58ea38..0bbb2fa 100644 --- a/style.css +++ b/style.css @@ -64,6 +64,7 @@ h3, summary { } h4 { + color: white; font-family: 'Open Sans', sans-serif; font-weight: 300; padding: 0; @@ -549,7 +550,10 @@ table tr:hover { } table tr.playing { - background-color: #393b40; +} + +.playing td, .playing td a { + color: var(--primary-color) !important; } table tr td { From 4dbbe857e632333fe3008a0ae0be5af47426498a Mon Sep 17 00:00:00 2001 From: Alexander Forselius Date: Fri, 7 Sep 2018 17:52:03 +0200 Subject: [PATCH 08/12] Working on notation --- bower_components/array-diff/array-diff.js | 96 + bower_components/moment/moment.js | 4506 +++++++++++++++++++++ bower_components/underscore/underscore.js | 1692 ++++++++ controllers/track.js | 11 +- filters/timeago.js | 10 +- index.html | 3 + partials/album.html | 6 +- partials/playlist.html | 25 +- partials/track.html | 23 +- services/api.js | 31 +- style.css | 23 +- 11 files changed, 6389 insertions(+), 37 deletions(-) create mode 100644 bower_components/array-diff/array-diff.js create mode 100644 bower_components/moment/moment.js create mode 100644 bower_components/underscore/underscore.js diff --git a/bower_components/array-diff/array-diff.js b/bower_components/array-diff/array-diff.js new file mode 100644 index 0000000..1838380 --- /dev/null +++ b/bower_components/array-diff/array-diff.js @@ -0,0 +1,96 @@ +// Originally from https://www.npmjs.com/package/array-diff + +// var _ = require('underscore') + + +var indexMap = function(list) { + var map = {} + list.forEach(function(each, i) { + map[each] = map[each] || [] + map[each].push(i) + }) + return map +} + +var longestCommonSubstring = function(seq1, seq2) { + var result = {startString1:0, startString2:0, length:0} + var indexMapBefore = indexMap(seq1) + var previousOverlap = [] + seq2.forEach(function(eachAfter, indexAfter) { + var overlapLength + var overlap = [] + var indexesBefore = indexMapBefore[eachAfter] || [] + indexesBefore.forEach(function(indexBefore) { + overlapLength = ((indexBefore && previousOverlap[indexBefore-1]) || 0) + 1; + if (overlapLength > result.length) { + result.length = overlapLength; + result.startString1 = indexBefore - overlapLength + 1; + result.startString2 = indexAfter - overlapLength + 1; + } + overlap[indexBefore] = overlapLength + }) + previousOverlap = overlap + }) + return result +} + + +var diff = function(before, after) { + var commonSeq = longestCommonSubstring(before, after) + var startBefore = commonSeq.startString1 + var startAfter = commonSeq.startString2 + if (commonSeq.length == 0) { + var result = before.map(function(each) { return ['-', each]}) + return result.concat(after.map(function(each) { return ['+', each]})) + } + var beforeLeft = before.slice(0, startBefore) + var afterLeft = after.slice(0, startAfter) + var equal = after.slice(startAfter, startAfter + commonSeq.length) + .map(function(each) {return ['=', each]}) + var beforeRight = before.slice(startBefore + commonSeq.length) + var afterRight = after.slice(startAfter + commonSeq.length) + return _.union(diff(beforeLeft, afterLeft), equal, diff(beforeRight, afterRight)) +} + +var orderedSetDiff = function(before, after) { + var diffRes = diff(before, after) + var result = [] + diffRes.forEach(function(each) { + switch(each[0]) { + case '=': + result.push(each) + break + case '-': + result.push((after.indexOf(each[1]) > -1) ? ['x', each[1]] : ['-', each[1]]) + break + case '+': + result.push((before.indexOf(each[1]) > -1) ? ['p', each[1]] : ['+', each[1]]) + } + }) + return result +} + +var compress = function(diff) { + var result = [] + var modifier + var section = [] + diff.forEach(function(each) { + if(modifier && (each[0] == modifier)) { + section.push(each[1]) + } else { + if(modifier) result.push([modifier, section]) + section = [each[1]] + modifier = each[0] + } + }) + if(modifier) result.push([modifier, section]) + return result +} + +function arrayDiff (opts) { + opts = opts || {} + return function(before, after) { + var result = opts.unique ? orderedSetDiff(before, after) : diff(before, after) + return opts.compress ? compress(result) : result + } +} \ No newline at end of file diff --git a/bower_components/moment/moment.js b/bower_components/moment/moment.js new file mode 100644 index 0000000..78fa233 --- /dev/null +++ b/bower_components/moment/moment.js @@ -0,0 +1,4506 @@ +//! moment.js + +;(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : + typeof define === 'function' && define.amd ? define(factory) : + global.moment = factory() +}(this, (function () { 'use strict'; + + var hookCallback; + + function hooks () { + return hookCallback.apply(null, arguments); + } + + // This is done to register the method called with moment() + // without creating circular dependencies. + function setHookCallback (callback) { + hookCallback = callback; + } + + function isArray(input) { + return input instanceof Array || Object.prototype.toString.call(input) === '[object Array]'; + } + + function isObject(input) { + // IE8 will treat undefined and null as object if it wasn't for + // input != null + return input != null && Object.prototype.toString.call(input) === '[object Object]'; + } + + function isObjectEmpty(obj) { + if (Object.getOwnPropertyNames) { + return (Object.getOwnPropertyNames(obj).length === 0); + } else { + var k; + for (k in obj) { + if (obj.hasOwnProperty(k)) { + return false; + } + } + return true; + } + } + + function isUndefined(input) { + return input === void 0; + } + + function isNumber(input) { + return typeof input === 'number' || Object.prototype.toString.call(input) === '[object Number]'; + } + + function isDate(input) { + return input instanceof Date || Object.prototype.toString.call(input) === '[object Date]'; + } + + function map(arr, fn) { + var res = [], i; + for (i = 0; i < arr.length; ++i) { + res.push(fn(arr[i], i)); + } + return res; + } + + function hasOwnProp(a, b) { + return Object.prototype.hasOwnProperty.call(a, b); + } + + function extend(a, b) { + for (var i in b) { + if (hasOwnProp(b, i)) { + a[i] = b[i]; + } + } + + if (hasOwnProp(b, 'toString')) { + a.toString = b.toString; + } + + if (hasOwnProp(b, 'valueOf')) { + a.valueOf = b.valueOf; + } + + return a; + } + + function createUTC (input, format, locale, strict) { + return createLocalOrUTC(input, format, locale, strict, true).utc(); + } + + function defaultParsingFlags() { + // We need to deep clone this object. + return { + empty : false, + unusedTokens : [], + unusedInput : [], + overflow : -2, + charsLeftOver : 0, + nullInput : false, + invalidMonth : null, + invalidFormat : false, + userInvalidated : false, + iso : false, + parsedDateParts : [], + meridiem : null, + rfc2822 : false, + weekdayMismatch : false + }; + } + + function getParsingFlags(m) { + if (m._pf == null) { + m._pf = defaultParsingFlags(); + } + return m._pf; + } + + var some; + if (Array.prototype.some) { + some = Array.prototype.some; + } else { + some = function (fun) { + var t = Object(this); + var len = t.length >>> 0; + + for (var i = 0; i < len; i++) { + if (i in t && fun.call(this, t[i], i, t)) { + return true; + } + } + + return false; + }; + } + + function isValid(m) { + if (m._isValid == null) { + var flags = getParsingFlags(m); + var parsedParts = some.call(flags.parsedDateParts, function (i) { + return i != null; + }); + var isNowValid = !isNaN(m._d.getTime()) && + flags.overflow < 0 && + !flags.empty && + !flags.invalidMonth && + !flags.invalidWeekday && + !flags.weekdayMismatch && + !flags.nullInput && + !flags.invalidFormat && + !flags.userInvalidated && + (!flags.meridiem || (flags.meridiem && parsedParts)); + + if (m._strict) { + isNowValid = isNowValid && + flags.charsLeftOver === 0 && + flags.unusedTokens.length === 0 && + flags.bigHour === undefined; + } + + if (Object.isFrozen == null || !Object.isFrozen(m)) { + m._isValid = isNowValid; + } + else { + return isNowValid; + } + } + return m._isValid; + } + + function createInvalid (flags) { + var m = createUTC(NaN); + if (flags != null) { + extend(getParsingFlags(m), flags); + } + else { + getParsingFlags(m).userInvalidated = true; + } + + return m; + } + + // Plugins that add properties should also add the key here (null value), + // so we can properly clone ourselves. + var momentProperties = hooks.momentProperties = []; + + function copyConfig(to, from) { + var i, prop, val; + + if (!isUndefined(from._isAMomentObject)) { + to._isAMomentObject = from._isAMomentObject; + } + if (!isUndefined(from._i)) { + to._i = from._i; + } + if (!isUndefined(from._f)) { + to._f = from._f; + } + if (!isUndefined(from._l)) { + to._l = from._l; + } + if (!isUndefined(from._strict)) { + to._strict = from._strict; + } + if (!isUndefined(from._tzm)) { + to._tzm = from._tzm; + } + if (!isUndefined(from._isUTC)) { + to._isUTC = from._isUTC; + } + if (!isUndefined(from._offset)) { + to._offset = from._offset; + } + if (!isUndefined(from._pf)) { + to._pf = getParsingFlags(from); + } + if (!isUndefined(from._locale)) { + to._locale = from._locale; + } + + if (momentProperties.length > 0) { + for (i = 0; i < momentProperties.length; i++) { + prop = momentProperties[i]; + val = from[prop]; + if (!isUndefined(val)) { + to[prop] = val; + } + } + } + + return to; + } + + var updateInProgress = false; + + // Moment prototype object + function Moment(config) { + copyConfig(this, config); + this._d = new Date(config._d != null ? config._d.getTime() : NaN); + if (!this.isValid()) { + this._d = new Date(NaN); + } + // Prevent infinite loop in case updateOffset creates new moment + // objects. + if (updateInProgress === false) { + updateInProgress = true; + hooks.updateOffset(this); + updateInProgress = false; + } + } + + function isMoment (obj) { + return obj instanceof Moment || (obj != null && obj._isAMomentObject != null); + } + + function absFloor (number) { + if (number < 0) { + // -0 -> 0 + return Math.ceil(number) || 0; + } else { + return Math.floor(number); + } + } + + function toInt(argumentForCoercion) { + var coercedNumber = +argumentForCoercion, + value = 0; + + if (coercedNumber !== 0 && isFinite(coercedNumber)) { + value = absFloor(coercedNumber); + } + + return value; + } + + // compare two arrays, return the number of differences + function compareArrays(array1, array2, dontConvert) { + var len = Math.min(array1.length, array2.length), + lengthDiff = Math.abs(array1.length - array2.length), + diffs = 0, + i; + for (i = 0; i < len; i++) { + if ((dontConvert && array1[i] !== array2[i]) || + (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) { + diffs++; + } + } + return diffs + lengthDiff; + } + + function warn(msg) { + if (hooks.suppressDeprecationWarnings === false && + (typeof console !== 'undefined') && console.warn) { + console.warn('Deprecation warning: ' + msg); + } + } + + function deprecate(msg, fn) { + var firstTime = true; + + return extend(function () { + if (hooks.deprecationHandler != null) { + hooks.deprecationHandler(null, msg); + } + if (firstTime) { + var args = []; + var arg; + for (var i = 0; i < arguments.length; i++) { + arg = ''; + if (typeof arguments[i] === 'object') { + arg += '\n[' + i + '] '; + for (var key in arguments[0]) { + arg += key + ': ' + arguments[0][key] + ', '; + } + arg = arg.slice(0, -2); // Remove trailing comma and space + } else { + arg = arguments[i]; + } + args.push(arg); + } + warn(msg + '\nArguments: ' + Array.prototype.slice.call(args).join('') + '\n' + (new Error()).stack); + firstTime = false; + } + return fn.apply(this, arguments); + }, fn); + } + + var deprecations = {}; + + function deprecateSimple(name, msg) { + if (hooks.deprecationHandler != null) { + hooks.deprecationHandler(name, msg); + } + if (!deprecations[name]) { + warn(msg); + deprecations[name] = true; + } + } + + hooks.suppressDeprecationWarnings = false; + hooks.deprecationHandler = null; + + function isFunction(input) { + return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]'; + } + + function set (config) { + var prop, i; + for (i in config) { + prop = config[i]; + if (isFunction(prop)) { + this[i] = prop; + } else { + this['_' + i] = prop; + } + } + this._config = config; + // Lenient ordinal parsing accepts just a number in addition to + // number + (possibly) stuff coming from _dayOfMonthOrdinalParse. + // TODO: Remove "ordinalParse" fallback in next major release. + this._dayOfMonthOrdinalParseLenient = new RegExp( + (this._dayOfMonthOrdinalParse.source || this._ordinalParse.source) + + '|' + (/\d{1,2}/).source); + } + + function mergeConfigs(parentConfig, childConfig) { + var res = extend({}, parentConfig), prop; + for (prop in childConfig) { + if (hasOwnProp(childConfig, prop)) { + if (isObject(parentConfig[prop]) && isObject(childConfig[prop])) { + res[prop] = {}; + extend(res[prop], parentConfig[prop]); + extend(res[prop], childConfig[prop]); + } else if (childConfig[prop] != null) { + res[prop] = childConfig[prop]; + } else { + delete res[prop]; + } + } + } + for (prop in parentConfig) { + if (hasOwnProp(parentConfig, prop) && + !hasOwnProp(childConfig, prop) && + isObject(parentConfig[prop])) { + // make sure changes to properties don't modify parent config + res[prop] = extend({}, res[prop]); + } + } + return res; + } + + function Locale(config) { + if (config != null) { + this.set(config); + } + } + + var keys; + + if (Object.keys) { + keys = Object.keys; + } else { + keys = function (obj) { + var i, res = []; + for (i in obj) { + if (hasOwnProp(obj, i)) { + res.push(i); + } + } + return res; + }; + } + + var defaultCalendar = { + sameDay : '[Today at] LT', + nextDay : '[Tomorrow at] LT', + nextWeek : 'dddd [at] LT', + lastDay : '[Yesterday at] LT', + lastWeek : '[Last] dddd [at] LT', + sameElse : 'L' + }; + + function calendar (key, mom, now) { + var output = this._calendar[key] || this._calendar['sameElse']; + return isFunction(output) ? output.call(mom, now) : output; + } + + var defaultLongDateFormat = { + LTS : 'h:mm:ss A', + LT : 'h:mm A', + L : 'MM/DD/YYYY', + LL : 'MMMM D, YYYY', + LLL : 'MMMM D, YYYY h:mm A', + LLLL : 'dddd, MMMM D, YYYY h:mm A' + }; + + function longDateFormat (key) { + var format = this._longDateFormat[key], + formatUpper = this._longDateFormat[key.toUpperCase()]; + + if (format || !formatUpper) { + return format; + } + + this._longDateFormat[key] = formatUpper.replace(/MMMM|MM|DD|dddd/g, function (val) { + return val.slice(1); + }); + + return this._longDateFormat[key]; + } + + var defaultInvalidDate = 'Invalid date'; + + function invalidDate () { + return this._invalidDate; + } + + var defaultOrdinal = '%d'; + var defaultDayOfMonthOrdinalParse = /\d{1,2}/; + + function ordinal (number) { + return this._ordinal.replace('%d', number); + } + + var defaultRelativeTime = { + future : 'in %s', + past : '%s ago', + s : 'a few seconds', + ss : '%d seconds', + m : 'a minute', + mm : '%d minutes', + h : 'an hour', + hh : '%d hours', + d : 'a day', + dd : '%d days', + M : 'a month', + MM : '%d months', + y : 'a year', + yy : '%d years' + }; + + function relativeTime (number, withoutSuffix, string, isFuture) { + var output = this._relativeTime[string]; + return (isFunction(output)) ? + output(number, withoutSuffix, string, isFuture) : + output.replace(/%d/i, number); + } + + function pastFuture (diff, output) { + var format = this._relativeTime[diff > 0 ? 'future' : 'past']; + return isFunction(format) ? format(output) : format.replace(/%s/i, output); + } + + var aliases = {}; + + function addUnitAlias (unit, shorthand) { + var lowerCase = unit.toLowerCase(); + aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit; + } + + function normalizeUnits(units) { + return typeof units === 'string' ? aliases[units] || aliases[units.toLowerCase()] : undefined; + } + + function normalizeObjectUnits(inputObject) { + var normalizedInput = {}, + normalizedProp, + prop; + + for (prop in inputObject) { + if (hasOwnProp(inputObject, prop)) { + normalizedProp = normalizeUnits(prop); + if (normalizedProp) { + normalizedInput[normalizedProp] = inputObject[prop]; + } + } + } + + return normalizedInput; + } + + var priorities = {}; + + function addUnitPriority(unit, priority) { + priorities[unit] = priority; + } + + function getPrioritizedUnits(unitsObj) { + var units = []; + for (var u in unitsObj) { + units.push({unit: u, priority: priorities[u]}); + } + units.sort(function (a, b) { + return a.priority - b.priority; + }); + return units; + } + + function zeroFill(number, targetLength, forceSign) { + var absNumber = '' + Math.abs(number), + zerosToFill = targetLength - absNumber.length, + sign = number >= 0; + return (sign ? (forceSign ? '+' : '') : '-') + + Math.pow(10, Math.max(0, zerosToFill)).toString().substr(1) + absNumber; + } + + var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g; + + var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g; + + var formatFunctions = {}; + + var formatTokenFunctions = {}; + + // token: 'M' + // padded: ['MM', 2] + // ordinal: 'Mo' + // callback: function () { this.month() + 1 } + function addFormatToken (token, padded, ordinal, callback) { + var func = callback; + if (typeof callback === 'string') { + func = function () { + return this[callback](); + }; + } + if (token) { + formatTokenFunctions[token] = func; + } + if (padded) { + formatTokenFunctions[padded[0]] = function () { + return zeroFill(func.apply(this, arguments), padded[1], padded[2]); + }; + } + if (ordinal) { + formatTokenFunctions[ordinal] = function () { + return this.localeData().ordinal(func.apply(this, arguments), token); + }; + } + } + + function removeFormattingTokens(input) { + if (input.match(/\[[\s\S]/)) { + return input.replace(/^\[|\]$/g, ''); + } + return input.replace(/\\/g, ''); + } + + function makeFormatFunction(format) { + var array = format.match(formattingTokens), i, length; + + for (i = 0, length = array.length; i < length; i++) { + if (formatTokenFunctions[array[i]]) { + array[i] = formatTokenFunctions[array[i]]; + } else { + array[i] = removeFormattingTokens(array[i]); + } + } + + return function (mom) { + var output = '', i; + for (i = 0; i < length; i++) { + output += isFunction(array[i]) ? array[i].call(mom, format) : array[i]; + } + return output; + }; + } + + // format date using native date object + function formatMoment(m, format) { + if (!m.isValid()) { + return m.localeData().invalidDate(); + } + + format = expandFormat(format, m.localeData()); + formatFunctions[format] = formatFunctions[format] || makeFormatFunction(format); + + return formatFunctions[format](m); + } + + function expandFormat(format, locale) { + var i = 5; + + function replaceLongDateFormatTokens(input) { + return locale.longDateFormat(input) || input; + } + + localFormattingTokens.lastIndex = 0; + while (i >= 0 && localFormattingTokens.test(format)) { + format = format.replace(localFormattingTokens, replaceLongDateFormatTokens); + localFormattingTokens.lastIndex = 0; + i -= 1; + } + + return format; + } + + var match1 = /\d/; // 0 - 9 + var match2 = /\d\d/; // 00 - 99 + var match3 = /\d{3}/; // 000 - 999 + var match4 = /\d{4}/; // 0000 - 9999 + var match6 = /[+-]?\d{6}/; // -999999 - 999999 + var match1to2 = /\d\d?/; // 0 - 99 + var match3to4 = /\d\d\d\d?/; // 999 - 9999 + var match5to6 = /\d\d\d\d\d\d?/; // 99999 - 999999 + var match1to3 = /\d{1,3}/; // 0 - 999 + var match1to4 = /\d{1,4}/; // 0 - 9999 + var match1to6 = /[+-]?\d{1,6}/; // -999999 - 999999 + + var matchUnsigned = /\d+/; // 0 - inf + var matchSigned = /[+-]?\d+/; // -inf - inf + + var matchOffset = /Z|[+-]\d\d:?\d\d/gi; // +00:00 -00:00 +0000 -0000 or Z + var matchShortOffset = /Z|[+-]\d\d(?::?\d\d)?/gi; // +00 -00 +00:00 -00:00 +0000 -0000 or Z + + var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123 + + // any word (or two) characters or numbers including two/three word month in arabic. + // includes scottish gaelic two word and hyphenated months + var matchWord = /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i; + + var regexes = {}; + + function addRegexToken (token, regex, strictRegex) { + regexes[token] = isFunction(regex) ? regex : function (isStrict, localeData) { + return (isStrict && strictRegex) ? strictRegex : regex; + }; + } + + function getParseRegexForToken (token, config) { + if (!hasOwnProp(regexes, token)) { + return new RegExp(unescapeFormat(token)); + } + + return regexes[token](config._strict, config._locale); + } + + // Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript + function unescapeFormat(s) { + return regexEscape(s.replace('\\', '').replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) { + return p1 || p2 || p3 || p4; + })); + } + + function regexEscape(s) { + return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); + } + + var tokens = {}; + + function addParseToken (token, callback) { + var i, func = callback; + if (typeof token === 'string') { + token = [token]; + } + if (isNumber(callback)) { + func = function (input, array) { + array[callback] = toInt(input); + }; + } + for (i = 0; i < token.length; i++) { + tokens[token[i]] = func; + } + } + + function addWeekParseToken (token, callback) { + addParseToken(token, function (input, array, config, token) { + config._w = config._w || {}; + callback(input, config._w, config, token); + }); + } + + function addTimeToArrayFromToken(token, input, config) { + if (input != null && hasOwnProp(tokens, token)) { + tokens[token](input, config._a, config, token); + } + } + + var YEAR = 0; + var MONTH = 1; + var DATE = 2; + var HOUR = 3; + var MINUTE = 4; + var SECOND = 5; + var MILLISECOND = 6; + var WEEK = 7; + var WEEKDAY = 8; + + // FORMATTING + + addFormatToken('Y', 0, 0, function () { + var y = this.year(); + return y <= 9999 ? '' + y : '+' + y; + }); + + addFormatToken(0, ['YY', 2], 0, function () { + return this.year() % 100; + }); + + addFormatToken(0, ['YYYY', 4], 0, 'year'); + addFormatToken(0, ['YYYYY', 5], 0, 'year'); + addFormatToken(0, ['YYYYYY', 6, true], 0, 'year'); + + // ALIASES + + addUnitAlias('year', 'y'); + + // PRIORITIES + + addUnitPriority('year', 1); + + // PARSING + + addRegexToken('Y', matchSigned); + addRegexToken('YY', match1to2, match2); + addRegexToken('YYYY', match1to4, match4); + addRegexToken('YYYYY', match1to6, match6); + addRegexToken('YYYYYY', match1to6, match6); + + addParseToken(['YYYYY', 'YYYYYY'], YEAR); + addParseToken('YYYY', function (input, array) { + array[YEAR] = input.length === 2 ? hooks.parseTwoDigitYear(input) : toInt(input); + }); + addParseToken('YY', function (input, array) { + array[YEAR] = hooks.parseTwoDigitYear(input); + }); + addParseToken('Y', function (input, array) { + array[YEAR] = parseInt(input, 10); + }); + + // HELPERS + + function daysInYear(year) { + return isLeapYear(year) ? 366 : 365; + } + + function isLeapYear(year) { + return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0; + } + + // HOOKS + + hooks.parseTwoDigitYear = function (input) { + return toInt(input) + (toInt(input) > 68 ? 1900 : 2000); + }; + + // MOMENTS + + var getSetYear = makeGetSet('FullYear', true); + + function getIsLeapYear () { + return isLeapYear(this.year()); + } + + function makeGetSet (unit, keepTime) { + return function (value) { + if (value != null) { + set$1(this, unit, value); + hooks.updateOffset(this, keepTime); + return this; + } else { + return get(this, unit); + } + }; + } + + function get (mom, unit) { + return mom.isValid() ? + mom._d['get' + (mom._isUTC ? 'UTC' : '') + unit]() : NaN; + } + + function set$1 (mom, unit, value) { + if (mom.isValid() && !isNaN(value)) { + if (unit === 'FullYear' && isLeapYear(mom.year()) && mom.month() === 1 && mom.date() === 29) { + mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value, mom.month(), daysInMonth(value, mom.month())); + } + else { + mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value); + } + } + } + + // MOMENTS + + function stringGet (units) { + units = normalizeUnits(units); + if (isFunction(this[units])) { + return this[units](); + } + return this; + } + + + function stringSet (units, value) { + if (typeof units === 'object') { + units = normalizeObjectUnits(units); + var prioritized = getPrioritizedUnits(units); + for (var i = 0; i < prioritized.length; i++) { + this[prioritized[i].unit](units[prioritized[i].unit]); + } + } else { + units = normalizeUnits(units); + if (isFunction(this[units])) { + return this[units](value); + } + } + return this; + } + + function mod(n, x) { + return ((n % x) + x) % x; + } + + var indexOf; + + if (Array.prototype.indexOf) { + indexOf = Array.prototype.indexOf; + } else { + indexOf = function (o) { + // I know + var i; + for (i = 0; i < this.length; ++i) { + if (this[i] === o) { + return i; + } + } + return -1; + }; + } + + function daysInMonth(year, month) { + if (isNaN(year) || isNaN(month)) { + return NaN; + } + var modMonth = mod(month, 12); + year += (month - modMonth) / 12; + return modMonth === 1 ? (isLeapYear(year) ? 29 : 28) : (31 - modMonth % 7 % 2); + } + + // FORMATTING + + addFormatToken('M', ['MM', 2], 'Mo', function () { + return this.month() + 1; + }); + + addFormatToken('MMM', 0, 0, function (format) { + return this.localeData().monthsShort(this, format); + }); + + addFormatToken('MMMM', 0, 0, function (format) { + return this.localeData().months(this, format); + }); + + // ALIASES + + addUnitAlias('month', 'M'); + + // PRIORITY + + addUnitPriority('month', 8); + + // PARSING + + addRegexToken('M', match1to2); + addRegexToken('MM', match1to2, match2); + addRegexToken('MMM', function (isStrict, locale) { + return locale.monthsShortRegex(isStrict); + }); + addRegexToken('MMMM', function (isStrict, locale) { + return locale.monthsRegex(isStrict); + }); + + addParseToken(['M', 'MM'], function (input, array) { + array[MONTH] = toInt(input) - 1; + }); + + addParseToken(['MMM', 'MMMM'], function (input, array, config, token) { + var month = config._locale.monthsParse(input, token, config._strict); + // if we didn't find a month name, mark the date as invalid. + if (month != null) { + array[MONTH] = month; + } else { + getParsingFlags(config).invalidMonth = input; + } + }); + + // LOCALES + + var MONTHS_IN_FORMAT = /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/; + var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'); + function localeMonths (m, format) { + if (!m) { + return isArray(this._months) ? this._months : + this._months['standalone']; + } + return isArray(this._months) ? this._months[m.month()] : + this._months[(this._months.isFormat || MONTHS_IN_FORMAT).test(format) ? 'format' : 'standalone'][m.month()]; + } + + var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'); + function localeMonthsShort (m, format) { + if (!m) { + return isArray(this._monthsShort) ? this._monthsShort : + this._monthsShort['standalone']; + } + return isArray(this._monthsShort) ? this._monthsShort[m.month()] : + this._monthsShort[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()]; + } + + function handleStrictParse(monthName, format, strict) { + var i, ii, mom, llc = monthName.toLocaleLowerCase(); + if (!this._monthsParse) { + // this is not used + this._monthsParse = []; + this._longMonthsParse = []; + this._shortMonthsParse = []; + for (i = 0; i < 12; ++i) { + mom = createUTC([2000, i]); + this._shortMonthsParse[i] = this.monthsShort(mom, '').toLocaleLowerCase(); + this._longMonthsParse[i] = this.months(mom, '').toLocaleLowerCase(); + } + } + + if (strict) { + if (format === 'MMM') { + ii = indexOf.call(this._shortMonthsParse, llc); + return ii !== -1 ? ii : null; + } else { + ii = indexOf.call(this._longMonthsParse, llc); + return ii !== -1 ? ii : null; + } + } else { + if (format === 'MMM') { + ii = indexOf.call(this._shortMonthsParse, llc); + if (ii !== -1) { + return ii; + } + ii = indexOf.call(this._longMonthsParse, llc); + return ii !== -1 ? ii : null; + } else { + ii = indexOf.call(this._longMonthsParse, llc); + if (ii !== -1) { + return ii; + } + ii = indexOf.call(this._shortMonthsParse, llc); + return ii !== -1 ? ii : null; + } + } + } + + function localeMonthsParse (monthName, format, strict) { + var i, mom, regex; + + if (this._monthsParseExact) { + return handleStrictParse.call(this, monthName, format, strict); + } + + if (!this._monthsParse) { + this._monthsParse = []; + this._longMonthsParse = []; + this._shortMonthsParse = []; + } + + // TODO: add sorting + // Sorting makes sure if one month (or abbr) is a prefix of another + // see sorting in computeMonthsParse + for (i = 0; i < 12; i++) { + // make the regex if we don't have it already + mom = createUTC([2000, i]); + if (strict && !this._longMonthsParse[i]) { + this._longMonthsParse[i] = new RegExp('^' + this.months(mom, '').replace('.', '') + '$', 'i'); + this._shortMonthsParse[i] = new RegExp('^' + this.monthsShort(mom, '').replace('.', '') + '$', 'i'); + } + if (!strict && !this._monthsParse[i]) { + regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, ''); + this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i'); + } + // test the regex + if (strict && format === 'MMMM' && this._longMonthsParse[i].test(monthName)) { + return i; + } else if (strict && format === 'MMM' && this._shortMonthsParse[i].test(monthName)) { + return i; + } else if (!strict && this._monthsParse[i].test(monthName)) { + return i; + } + } + } + + // MOMENTS + + function setMonth (mom, value) { + var dayOfMonth; + + if (!mom.isValid()) { + // No op + return mom; + } + + if (typeof value === 'string') { + if (/^\d+$/.test(value)) { + value = toInt(value); + } else { + value = mom.localeData().monthsParse(value); + // TODO: Another silent failure? + if (!isNumber(value)) { + return mom; + } + } + } + + dayOfMonth = Math.min(mom.date(), daysInMonth(mom.year(), value)); + mom._d['set' + (mom._isUTC ? 'UTC' : '') + 'Month'](value, dayOfMonth); + return mom; + } + + function getSetMonth (value) { + if (value != null) { + setMonth(this, value); + hooks.updateOffset(this, true); + return this; + } else { + return get(this, 'Month'); + } + } + + function getDaysInMonth () { + return daysInMonth(this.year(), this.month()); + } + + var defaultMonthsShortRegex = matchWord; + function monthsShortRegex (isStrict) { + if (this._monthsParseExact) { + if (!hasOwnProp(this, '_monthsRegex')) { + computeMonthsParse.call(this); + } + if (isStrict) { + return this._monthsShortStrictRegex; + } else { + return this._monthsShortRegex; + } + } else { + if (!hasOwnProp(this, '_monthsShortRegex')) { + this._monthsShortRegex = defaultMonthsShortRegex; + } + return this._monthsShortStrictRegex && isStrict ? + this._monthsShortStrictRegex : this._monthsShortRegex; + } + } + + var defaultMonthsRegex = matchWord; + function monthsRegex (isStrict) { + if (this._monthsParseExact) { + if (!hasOwnProp(this, '_monthsRegex')) { + computeMonthsParse.call(this); + } + if (isStrict) { + return this._monthsStrictRegex; + } else { + return this._monthsRegex; + } + } else { + if (!hasOwnProp(this, '_monthsRegex')) { + this._monthsRegex = defaultMonthsRegex; + } + return this._monthsStrictRegex && isStrict ? + this._monthsStrictRegex : this._monthsRegex; + } + } + + function computeMonthsParse () { + function cmpLenRev(a, b) { + return b.length - a.length; + } + + var shortPieces = [], longPieces = [], mixedPieces = [], + i, mom; + for (i = 0; i < 12; i++) { + // make the regex if we don't have it already + mom = createUTC([2000, i]); + shortPieces.push(this.monthsShort(mom, '')); + longPieces.push(this.months(mom, '')); + mixedPieces.push(this.months(mom, '')); + mixedPieces.push(this.monthsShort(mom, '')); + } + // Sorting makes sure if one month (or abbr) is a prefix of another it + // will match the longer piece. + shortPieces.sort(cmpLenRev); + longPieces.sort(cmpLenRev); + mixedPieces.sort(cmpLenRev); + for (i = 0; i < 12; i++) { + shortPieces[i] = regexEscape(shortPieces[i]); + longPieces[i] = regexEscape(longPieces[i]); + } + for (i = 0; i < 24; i++) { + mixedPieces[i] = regexEscape(mixedPieces[i]); + } + + this._monthsRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i'); + this._monthsShortRegex = this._monthsRegex; + this._monthsStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i'); + this._monthsShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i'); + } + + function createDate (y, m, d, h, M, s, ms) { + // can't just apply() to create a date: + // https://stackoverflow.com/q/181348 + var date = new Date(y, m, d, h, M, s, ms); + + // the date constructor remaps years 0-99 to 1900-1999 + if (y < 100 && y >= 0 && isFinite(date.getFullYear())) { + date.setFullYear(y); + } + return date; + } + + function createUTCDate (y) { + var date = new Date(Date.UTC.apply(null, arguments)); + + // the Date.UTC function remaps years 0-99 to 1900-1999 + if (y < 100 && y >= 0 && isFinite(date.getUTCFullYear())) { + date.setUTCFullYear(y); + } + return date; + } + + // start-of-first-week - start-of-year + function firstWeekOffset(year, dow, doy) { + var // first-week day -- which january is always in the first week (4 for iso, 1 for other) + fwd = 7 + dow - doy, + // first-week day local weekday -- which local weekday is fwd + fwdlw = (7 + createUTCDate(year, 0, fwd).getUTCDay() - dow) % 7; + + return -fwdlw + fwd - 1; + } + + // https://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday + function dayOfYearFromWeeks(year, week, weekday, dow, doy) { + var localWeekday = (7 + weekday - dow) % 7, + weekOffset = firstWeekOffset(year, dow, doy), + dayOfYear = 1 + 7 * (week - 1) + localWeekday + weekOffset, + resYear, resDayOfYear; + + if (dayOfYear <= 0) { + resYear = year - 1; + resDayOfYear = daysInYear(resYear) + dayOfYear; + } else if (dayOfYear > daysInYear(year)) { + resYear = year + 1; + resDayOfYear = dayOfYear - daysInYear(year); + } else { + resYear = year; + resDayOfYear = dayOfYear; + } + + return { + year: resYear, + dayOfYear: resDayOfYear + }; + } + + function weekOfYear(mom, dow, doy) { + var weekOffset = firstWeekOffset(mom.year(), dow, doy), + week = Math.floor((mom.dayOfYear() - weekOffset - 1) / 7) + 1, + resWeek, resYear; + + if (week < 1) { + resYear = mom.year() - 1; + resWeek = week + weeksInYear(resYear, dow, doy); + } else if (week > weeksInYear(mom.year(), dow, doy)) { + resWeek = week - weeksInYear(mom.year(), dow, doy); + resYear = mom.year() + 1; + } else { + resYear = mom.year(); + resWeek = week; + } + + return { + week: resWeek, + year: resYear + }; + } + + function weeksInYear(year, dow, doy) { + var weekOffset = firstWeekOffset(year, dow, doy), + weekOffsetNext = firstWeekOffset(year + 1, dow, doy); + return (daysInYear(year) - weekOffset + weekOffsetNext) / 7; + } + + // FORMATTING + + addFormatToken('w', ['ww', 2], 'wo', 'week'); + addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek'); + + // ALIASES + + addUnitAlias('week', 'w'); + addUnitAlias('isoWeek', 'W'); + + // PRIORITIES + + addUnitPriority('week', 5); + addUnitPriority('isoWeek', 5); + + // PARSING + + addRegexToken('w', match1to2); + addRegexToken('ww', match1to2, match2); + addRegexToken('W', match1to2); + addRegexToken('WW', match1to2, match2); + + addWeekParseToken(['w', 'ww', 'W', 'WW'], function (input, week, config, token) { + week[token.substr(0, 1)] = toInt(input); + }); + + // HELPERS + + // LOCALES + + function localeWeek (mom) { + return weekOfYear(mom, this._week.dow, this._week.doy).week; + } + + var defaultLocaleWeek = { + dow : 0, // Sunday is the first day of the week. + doy : 6 // The week that contains Jan 1st is the first week of the year. + }; + + function localeFirstDayOfWeek () { + return this._week.dow; + } + + function localeFirstDayOfYear () { + return this._week.doy; + } + + // MOMENTS + + function getSetWeek (input) { + var week = this.localeData().week(this); + return input == null ? week : this.add((input - week) * 7, 'd'); + } + + function getSetISOWeek (input) { + var week = weekOfYear(this, 1, 4).week; + return input == null ? week : this.add((input - week) * 7, 'd'); + } + + // FORMATTING + + addFormatToken('d', 0, 'do', 'day'); + + addFormatToken('dd', 0, 0, function (format) { + return this.localeData().weekdaysMin(this, format); + }); + + addFormatToken('ddd', 0, 0, function (format) { + return this.localeData().weekdaysShort(this, format); + }); + + addFormatToken('dddd', 0, 0, function (format) { + return this.localeData().weekdays(this, format); + }); + + addFormatToken('e', 0, 0, 'weekday'); + addFormatToken('E', 0, 0, 'isoWeekday'); + + // ALIASES + + addUnitAlias('day', 'd'); + addUnitAlias('weekday', 'e'); + addUnitAlias('isoWeekday', 'E'); + + // PRIORITY + addUnitPriority('day', 11); + addUnitPriority('weekday', 11); + addUnitPriority('isoWeekday', 11); + + // PARSING + + addRegexToken('d', match1to2); + addRegexToken('e', match1to2); + addRegexToken('E', match1to2); + addRegexToken('dd', function (isStrict, locale) { + return locale.weekdaysMinRegex(isStrict); + }); + addRegexToken('ddd', function (isStrict, locale) { + return locale.weekdaysShortRegex(isStrict); + }); + addRegexToken('dddd', function (isStrict, locale) { + return locale.weekdaysRegex(isStrict); + }); + + addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config, token) { + var weekday = config._locale.weekdaysParse(input, token, config._strict); + // if we didn't get a weekday name, mark the date as invalid + if (weekday != null) { + week.d = weekday; + } else { + getParsingFlags(config).invalidWeekday = input; + } + }); + + addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) { + week[token] = toInt(input); + }); + + // HELPERS + + function parseWeekday(input, locale) { + if (typeof input !== 'string') { + return input; + } + + if (!isNaN(input)) { + return parseInt(input, 10); + } + + input = locale.weekdaysParse(input); + if (typeof input === 'number') { + return input; + } + + return null; + } + + function parseIsoWeekday(input, locale) { + if (typeof input === 'string') { + return locale.weekdaysParse(input) % 7 || 7; + } + return isNaN(input) ? null : input; + } + + // LOCALES + + var defaultLocaleWeekdays = 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'); + function localeWeekdays (m, format) { + if (!m) { + return isArray(this._weekdays) ? this._weekdays : + this._weekdays['standalone']; + } + return isArray(this._weekdays) ? this._weekdays[m.day()] : + this._weekdays[this._weekdays.isFormat.test(format) ? 'format' : 'standalone'][m.day()]; + } + + var defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'); + function localeWeekdaysShort (m) { + return (m) ? this._weekdaysShort[m.day()] : this._weekdaysShort; + } + + var defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'); + function localeWeekdaysMin (m) { + return (m) ? this._weekdaysMin[m.day()] : this._weekdaysMin; + } + + function handleStrictParse$1(weekdayName, format, strict) { + var i, ii, mom, llc = weekdayName.toLocaleLowerCase(); + if (!this._weekdaysParse) { + this._weekdaysParse = []; + this._shortWeekdaysParse = []; + this._minWeekdaysParse = []; + + for (i = 0; i < 7; ++i) { + mom = createUTC([2000, 1]).day(i); + this._minWeekdaysParse[i] = this.weekdaysMin(mom, '').toLocaleLowerCase(); + this._shortWeekdaysParse[i] = this.weekdaysShort(mom, '').toLocaleLowerCase(); + this._weekdaysParse[i] = this.weekdays(mom, '').toLocaleLowerCase(); + } + } + + if (strict) { + if (format === 'dddd') { + ii = indexOf.call(this._weekdaysParse, llc); + return ii !== -1 ? ii : null; + } else if (format === 'ddd') { + ii = indexOf.call(this._shortWeekdaysParse, llc); + return ii !== -1 ? ii : null; + } else { + ii = indexOf.call(this._minWeekdaysParse, llc); + return ii !== -1 ? ii : null; + } + } else { + if (format === 'dddd') { + ii = indexOf.call(this._weekdaysParse, llc); + if (ii !== -1) { + return ii; + } + ii = indexOf.call(this._shortWeekdaysParse, llc); + if (ii !== -1) { + return ii; + } + ii = indexOf.call(this._minWeekdaysParse, llc); + return ii !== -1 ? ii : null; + } else if (format === 'ddd') { + ii = indexOf.call(this._shortWeekdaysParse, llc); + if (ii !== -1) { + return ii; + } + ii = indexOf.call(this._weekdaysParse, llc); + if (ii !== -1) { + return ii; + } + ii = indexOf.call(this._minWeekdaysParse, llc); + return ii !== -1 ? ii : null; + } else { + ii = indexOf.call(this._minWeekdaysParse, llc); + if (ii !== -1) { + return ii; + } + ii = indexOf.call(this._weekdaysParse, llc); + if (ii !== -1) { + return ii; + } + ii = indexOf.call(this._shortWeekdaysParse, llc); + return ii !== -1 ? ii : null; + } + } + } + + function localeWeekdaysParse (weekdayName, format, strict) { + var i, mom, regex; + + if (this._weekdaysParseExact) { + return handleStrictParse$1.call(this, weekdayName, format, strict); + } + + if (!this._weekdaysParse) { + this._weekdaysParse = []; + this._minWeekdaysParse = []; + this._shortWeekdaysParse = []; + this._fullWeekdaysParse = []; + } + + for (i = 0; i < 7; i++) { + // make the regex if we don't have it already + + mom = createUTC([2000, 1]).day(i); + if (strict && !this._fullWeekdaysParse[i]) { + this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\\.?') + '$', 'i'); + this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\\.?') + '$', 'i'); + this._minWeekdaysParse[i] = new RegExp('^' + this.weekdaysMin(mom, '').replace('.', '\\.?') + '$', 'i'); + } + if (!this._weekdaysParse[i]) { + regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, ''); + this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i'); + } + // test the regex + if (strict && format === 'dddd' && this._fullWeekdaysParse[i].test(weekdayName)) { + return i; + } else if (strict && format === 'ddd' && this._shortWeekdaysParse[i].test(weekdayName)) { + return i; + } else if (strict && format === 'dd' && this._minWeekdaysParse[i].test(weekdayName)) { + return i; + } else if (!strict && this._weekdaysParse[i].test(weekdayName)) { + return i; + } + } + } + + // MOMENTS + + function getSetDayOfWeek (input) { + if (!this.isValid()) { + return input != null ? this : NaN; + } + var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay(); + if (input != null) { + input = parseWeekday(input, this.localeData()); + return this.add(input - day, 'd'); + } else { + return day; + } + } + + function getSetLocaleDayOfWeek (input) { + if (!this.isValid()) { + return input != null ? this : NaN; + } + var weekday = (this.day() + 7 - this.localeData()._week.dow) % 7; + return input == null ? weekday : this.add(input - weekday, 'd'); + } + + function getSetISODayOfWeek (input) { + if (!this.isValid()) { + return input != null ? this : NaN; + } + + // behaves the same as moment#day except + // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6) + // as a setter, sunday should belong to the previous week. + + if (input != null) { + var weekday = parseIsoWeekday(input, this.localeData()); + return this.day(this.day() % 7 ? weekday : weekday - 7); + } else { + return this.day() || 7; + } + } + + var defaultWeekdaysRegex = matchWord; + function weekdaysRegex (isStrict) { + if (this._weekdaysParseExact) { + if (!hasOwnProp(this, '_weekdaysRegex')) { + computeWeekdaysParse.call(this); + } + if (isStrict) { + return this._weekdaysStrictRegex; + } else { + return this._weekdaysRegex; + } + } else { + if (!hasOwnProp(this, '_weekdaysRegex')) { + this._weekdaysRegex = defaultWeekdaysRegex; + } + return this._weekdaysStrictRegex && isStrict ? + this._weekdaysStrictRegex : this._weekdaysRegex; + } + } + + var defaultWeekdaysShortRegex = matchWord; + function weekdaysShortRegex (isStrict) { + if (this._weekdaysParseExact) { + if (!hasOwnProp(this, '_weekdaysRegex')) { + computeWeekdaysParse.call(this); + } + if (isStrict) { + return this._weekdaysShortStrictRegex; + } else { + return this._weekdaysShortRegex; + } + } else { + if (!hasOwnProp(this, '_weekdaysShortRegex')) { + this._weekdaysShortRegex = defaultWeekdaysShortRegex; + } + return this._weekdaysShortStrictRegex && isStrict ? + this._weekdaysShortStrictRegex : this._weekdaysShortRegex; + } + } + + var defaultWeekdaysMinRegex = matchWord; + function weekdaysMinRegex (isStrict) { + if (this._weekdaysParseExact) { + if (!hasOwnProp(this, '_weekdaysRegex')) { + computeWeekdaysParse.call(this); + } + if (isStrict) { + return this._weekdaysMinStrictRegex; + } else { + return this._weekdaysMinRegex; + } + } else { + if (!hasOwnProp(this, '_weekdaysMinRegex')) { + this._weekdaysMinRegex = defaultWeekdaysMinRegex; + } + return this._weekdaysMinStrictRegex && isStrict ? + this._weekdaysMinStrictRegex : this._weekdaysMinRegex; + } + } + + + function computeWeekdaysParse () { + function cmpLenRev(a, b) { + return b.length - a.length; + } + + var minPieces = [], shortPieces = [], longPieces = [], mixedPieces = [], + i, mom, minp, shortp, longp; + for (i = 0; i < 7; i++) { + // make the regex if we don't have it already + mom = createUTC([2000, 1]).day(i); + minp = this.weekdaysMin(mom, ''); + shortp = this.weekdaysShort(mom, ''); + longp = this.weekdays(mom, ''); + minPieces.push(minp); + shortPieces.push(shortp); + longPieces.push(longp); + mixedPieces.push(minp); + mixedPieces.push(shortp); + mixedPieces.push(longp); + } + // Sorting makes sure if one weekday (or abbr) is a prefix of another it + // will match the longer piece. + minPieces.sort(cmpLenRev); + shortPieces.sort(cmpLenRev); + longPieces.sort(cmpLenRev); + mixedPieces.sort(cmpLenRev); + for (i = 0; i < 7; i++) { + shortPieces[i] = regexEscape(shortPieces[i]); + longPieces[i] = regexEscape(longPieces[i]); + mixedPieces[i] = regexEscape(mixedPieces[i]); + } + + this._weekdaysRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i'); + this._weekdaysShortRegex = this._weekdaysRegex; + this._weekdaysMinRegex = this._weekdaysRegex; + + this._weekdaysStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i'); + this._weekdaysShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i'); + this._weekdaysMinStrictRegex = new RegExp('^(' + minPieces.join('|') + ')', 'i'); + } + + // FORMATTING + + function hFormat() { + return this.hours() % 12 || 12; + } + + function kFormat() { + return this.hours() || 24; + } + + addFormatToken('H', ['HH', 2], 0, 'hour'); + addFormatToken('h', ['hh', 2], 0, hFormat); + addFormatToken('k', ['kk', 2], 0, kFormat); + + addFormatToken('hmm', 0, 0, function () { + return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2); + }); + + addFormatToken('hmmss', 0, 0, function () { + return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2) + + zeroFill(this.seconds(), 2); + }); + + addFormatToken('Hmm', 0, 0, function () { + return '' + this.hours() + zeroFill(this.minutes(), 2); + }); + + addFormatToken('Hmmss', 0, 0, function () { + return '' + this.hours() + zeroFill(this.minutes(), 2) + + zeroFill(this.seconds(), 2); + }); + + function meridiem (token, lowercase) { + addFormatToken(token, 0, 0, function () { + return this.localeData().meridiem(this.hours(), this.minutes(), lowercase); + }); + } + + meridiem('a', true); + meridiem('A', false); + + // ALIASES + + addUnitAlias('hour', 'h'); + + // PRIORITY + addUnitPriority('hour', 13); + + // PARSING + + function matchMeridiem (isStrict, locale) { + return locale._meridiemParse; + } + + addRegexToken('a', matchMeridiem); + addRegexToken('A', matchMeridiem); + addRegexToken('H', match1to2); + addRegexToken('h', match1to2); + addRegexToken('k', match1to2); + addRegexToken('HH', match1to2, match2); + addRegexToken('hh', match1to2, match2); + addRegexToken('kk', match1to2, match2); + + addRegexToken('hmm', match3to4); + addRegexToken('hmmss', match5to6); + addRegexToken('Hmm', match3to4); + addRegexToken('Hmmss', match5to6); + + addParseToken(['H', 'HH'], HOUR); + addParseToken(['k', 'kk'], function (input, array, config) { + var kInput = toInt(input); + array[HOUR] = kInput === 24 ? 0 : kInput; + }); + addParseToken(['a', 'A'], function (input, array, config) { + config._isPm = config._locale.isPM(input); + config._meridiem = input; + }); + addParseToken(['h', 'hh'], function (input, array, config) { + array[HOUR] = toInt(input); + getParsingFlags(config).bigHour = true; + }); + addParseToken('hmm', function (input, array, config) { + var pos = input.length - 2; + array[HOUR] = toInt(input.substr(0, pos)); + array[MINUTE] = toInt(input.substr(pos)); + getParsingFlags(config).bigHour = true; + }); + addParseToken('hmmss', function (input, array, config) { + var pos1 = input.length - 4; + var pos2 = input.length - 2; + array[HOUR] = toInt(input.substr(0, pos1)); + array[MINUTE] = toInt(input.substr(pos1, 2)); + array[SECOND] = toInt(input.substr(pos2)); + getParsingFlags(config).bigHour = true; + }); + addParseToken('Hmm', function (input, array, config) { + var pos = input.length - 2; + array[HOUR] = toInt(input.substr(0, pos)); + array[MINUTE] = toInt(input.substr(pos)); + }); + addParseToken('Hmmss', function (input, array, config) { + var pos1 = input.length - 4; + var pos2 = input.length - 2; + array[HOUR] = toInt(input.substr(0, pos1)); + array[MINUTE] = toInt(input.substr(pos1, 2)); + array[SECOND] = toInt(input.substr(pos2)); + }); + + // LOCALES + + function localeIsPM (input) { + // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays + // Using charAt should be more compatible. + return ((input + '').toLowerCase().charAt(0) === 'p'); + } + + var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i; + function localeMeridiem (hours, minutes, isLower) { + if (hours > 11) { + return isLower ? 'pm' : 'PM'; + } else { + return isLower ? 'am' : 'AM'; + } + } + + + // MOMENTS + + // Setting the hour should keep the time, because the user explicitly + // specified which hour they want. So trying to maintain the same hour (in + // a new timezone) makes sense. Adding/subtracting hours does not follow + // this rule. + var getSetHour = makeGetSet('Hours', true); + + var baseConfig = { + calendar: defaultCalendar, + longDateFormat: defaultLongDateFormat, + invalidDate: defaultInvalidDate, + ordinal: defaultOrdinal, + dayOfMonthOrdinalParse: defaultDayOfMonthOrdinalParse, + relativeTime: defaultRelativeTime, + + months: defaultLocaleMonths, + monthsShort: defaultLocaleMonthsShort, + + week: defaultLocaleWeek, + + weekdays: defaultLocaleWeekdays, + weekdaysMin: defaultLocaleWeekdaysMin, + weekdaysShort: defaultLocaleWeekdaysShort, + + meridiemParse: defaultLocaleMeridiemParse + }; + + // internal storage for locale config files + var locales = {}; + var localeFamilies = {}; + var globalLocale; + + function normalizeLocale(key) { + return key ? key.toLowerCase().replace('_', '-') : key; + } + + // pick the locale from the array + // try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each + // substring from most specific to least, but move to the next array item if it's a more specific variant than the current root + function chooseLocale(names) { + var i = 0, j, next, locale, split; + + while (i < names.length) { + split = normalizeLocale(names[i]).split('-'); + j = split.length; + next = normalizeLocale(names[i + 1]); + next = next ? next.split('-') : null; + while (j > 0) { + locale = loadLocale(split.slice(0, j).join('-')); + if (locale) { + return locale; + } + if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) { + //the next array item is better than a shallower substring of this one + break; + } + j--; + } + i++; + } + return globalLocale; + } + + function loadLocale(name) { + var oldLocale = null; + // TODO: Find a better way to register and load all the locales in Node + if (!locales[name] && (typeof module !== 'undefined') && + module && module.exports) { + try { + oldLocale = globalLocale._abbr; + var aliasedRequire = require; + aliasedRequire('./locale/' + name); + getSetGlobalLocale(oldLocale); + } catch (e) {} + } + return locales[name]; + } + + // This function will load locale and then set the global locale. If + // no arguments are passed in, it will simply return the current global + // locale key. + function getSetGlobalLocale (key, values) { + var data; + if (key) { + if (isUndefined(values)) { + data = getLocale(key); + } + else { + data = defineLocale(key, values); + } + + if (data) { + // moment.duration._locale = moment._locale = data; + globalLocale = data; + } + else { + if ((typeof console !== 'undefined') && console.warn) { + //warn user if arguments are passed but the locale could not be set + console.warn('Locale ' + key + ' not found. Did you forget to load it?'); + } + } + } + + return globalLocale._abbr; + } + + function defineLocale (name, config) { + if (config !== null) { + var locale, parentConfig = baseConfig; + config.abbr = name; + if (locales[name] != null) { + deprecateSimple('defineLocaleOverride', + 'use moment.updateLocale(localeName, config) to change ' + + 'an existing locale. moment.defineLocale(localeName, ' + + 'config) should only be used for creating a new locale ' + + 'See http://momentjs.com/guides/#/warnings/define-locale/ for more info.'); + parentConfig = locales[name]._config; + } else if (config.parentLocale != null) { + if (locales[config.parentLocale] != null) { + parentConfig = locales[config.parentLocale]._config; + } else { + locale = loadLocale(config.parentLocale); + if (locale != null) { + parentConfig = locale._config; + } else { + if (!localeFamilies[config.parentLocale]) { + localeFamilies[config.parentLocale] = []; + } + localeFamilies[config.parentLocale].push({ + name: name, + config: config + }); + return null; + } + } + } + locales[name] = new Locale(mergeConfigs(parentConfig, config)); + + if (localeFamilies[name]) { + localeFamilies[name].forEach(function (x) { + defineLocale(x.name, x.config); + }); + } + + // backwards compat for now: also set the locale + // make sure we set the locale AFTER all child locales have been + // created, so we won't end up with the child locale set. + getSetGlobalLocale(name); + + + return locales[name]; + } else { + // useful for testing + delete locales[name]; + return null; + } + } + + function updateLocale(name, config) { + if (config != null) { + var locale, tmpLocale, parentConfig = baseConfig; + // MERGE + tmpLocale = loadLocale(name); + if (tmpLocale != null) { + parentConfig = tmpLocale._config; + } + config = mergeConfigs(parentConfig, config); + locale = new Locale(config); + locale.parentLocale = locales[name]; + locales[name] = locale; + + // backwards compat for now: also set the locale + getSetGlobalLocale(name); + } else { + // pass null for config to unupdate, useful for tests + if (locales[name] != null) { + if (locales[name].parentLocale != null) { + locales[name] = locales[name].parentLocale; + } else if (locales[name] != null) { + delete locales[name]; + } + } + } + return locales[name]; + } + + // returns locale data + function getLocale (key) { + var locale; + + if (key && key._locale && key._locale._abbr) { + key = key._locale._abbr; + } + + if (!key) { + return globalLocale; + } + + if (!isArray(key)) { + //short-circuit everything else + locale = loadLocale(key); + if (locale) { + return locale; + } + key = [key]; + } + + return chooseLocale(key); + } + + function listLocales() { + return keys(locales); + } + + function checkOverflow (m) { + var overflow; + var a = m._a; + + if (a && getParsingFlags(m).overflow === -2) { + overflow = + a[MONTH] < 0 || a[MONTH] > 11 ? MONTH : + a[DATE] < 1 || a[DATE] > daysInMonth(a[YEAR], a[MONTH]) ? DATE : + a[HOUR] < 0 || a[HOUR] > 24 || (a[HOUR] === 24 && (a[MINUTE] !== 0 || a[SECOND] !== 0 || a[MILLISECOND] !== 0)) ? HOUR : + a[MINUTE] < 0 || a[MINUTE] > 59 ? MINUTE : + a[SECOND] < 0 || a[SECOND] > 59 ? SECOND : + a[MILLISECOND] < 0 || a[MILLISECOND] > 999 ? MILLISECOND : + -1; + + if (getParsingFlags(m)._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) { + overflow = DATE; + } + if (getParsingFlags(m)._overflowWeeks && overflow === -1) { + overflow = WEEK; + } + if (getParsingFlags(m)._overflowWeekday && overflow === -1) { + overflow = WEEKDAY; + } + + getParsingFlags(m).overflow = overflow; + } + + return m; + } + + // Pick the first defined of two or three arguments. + function defaults(a, b, c) { + if (a != null) { + return a; + } + if (b != null) { + return b; + } + return c; + } + + function currentDateArray(config) { + // hooks is actually the exported moment object + var nowValue = new Date(hooks.now()); + if (config._useUTC) { + return [nowValue.getUTCFullYear(), nowValue.getUTCMonth(), nowValue.getUTCDate()]; + } + return [nowValue.getFullYear(), nowValue.getMonth(), nowValue.getDate()]; + } + + // convert an array to a date. + // the array should mirror the parameters below + // note: all values past the year are optional and will default to the lowest possible value. + // [year, month, day , hour, minute, second, millisecond] + function configFromArray (config) { + var i, date, input = [], currentDate, expectedWeekday, yearToUse; + + if (config._d) { + return; + } + + currentDate = currentDateArray(config); + + //compute day of the year from weeks and weekdays + if (config._w && config._a[DATE] == null && config._a[MONTH] == null) { + dayOfYearFromWeekInfo(config); + } + + //if the day of the year is set, figure out what it is + if (config._dayOfYear != null) { + yearToUse = defaults(config._a[YEAR], currentDate[YEAR]); + + if (config._dayOfYear > daysInYear(yearToUse) || config._dayOfYear === 0) { + getParsingFlags(config)._overflowDayOfYear = true; + } + + date = createUTCDate(yearToUse, 0, config._dayOfYear); + config._a[MONTH] = date.getUTCMonth(); + config._a[DATE] = date.getUTCDate(); + } + + // Default to current date. + // * if no year, month, day of month are given, default to today + // * if day of month is given, default month and year + // * if month is given, default only year + // * if year is given, don't default anything + for (i = 0; i < 3 && config._a[i] == null; ++i) { + config._a[i] = input[i] = currentDate[i]; + } + + // Zero out whatever was not defaulted, including time + for (; i < 7; i++) { + config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i]; + } + + // Check for 24:00:00.000 + if (config._a[HOUR] === 24 && + config._a[MINUTE] === 0 && + config._a[SECOND] === 0 && + config._a[MILLISECOND] === 0) { + config._nextDay = true; + config._a[HOUR] = 0; + } + + config._d = (config._useUTC ? createUTCDate : createDate).apply(null, input); + expectedWeekday = config._useUTC ? config._d.getUTCDay() : config._d.getDay(); + + // Apply timezone offset from input. The actual utcOffset can be changed + // with parseZone. + if (config._tzm != null) { + config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm); + } + + if (config._nextDay) { + config._a[HOUR] = 24; + } + + // check for mismatching day of week + if (config._w && typeof config._w.d !== 'undefined' && config._w.d !== expectedWeekday) { + getParsingFlags(config).weekdayMismatch = true; + } + } + + function dayOfYearFromWeekInfo(config) { + var w, weekYear, week, weekday, dow, doy, temp, weekdayOverflow; + + w = config._w; + if (w.GG != null || w.W != null || w.E != null) { + dow = 1; + doy = 4; + + // TODO: We need to take the current isoWeekYear, but that depends on + // how we interpret now (local, utc, fixed offset). So create + // a now version of current config (take local/utc/offset flags, and + // create now). + weekYear = defaults(w.GG, config._a[YEAR], weekOfYear(createLocal(), 1, 4).year); + week = defaults(w.W, 1); + weekday = defaults(w.E, 1); + if (weekday < 1 || weekday > 7) { + weekdayOverflow = true; + } + } else { + dow = config._locale._week.dow; + doy = config._locale._week.doy; + + var curWeek = weekOfYear(createLocal(), dow, doy); + + weekYear = defaults(w.gg, config._a[YEAR], curWeek.year); + + // Default to current week. + week = defaults(w.w, curWeek.week); + + if (w.d != null) { + // weekday -- low day numbers are considered next week + weekday = w.d; + if (weekday < 0 || weekday > 6) { + weekdayOverflow = true; + } + } else if (w.e != null) { + // local weekday -- counting starts from begining of week + weekday = w.e + dow; + if (w.e < 0 || w.e > 6) { + weekdayOverflow = true; + } + } else { + // default to begining of week + weekday = dow; + } + } + if (week < 1 || week > weeksInYear(weekYear, dow, doy)) { + getParsingFlags(config)._overflowWeeks = true; + } else if (weekdayOverflow != null) { + getParsingFlags(config)._overflowWeekday = true; + } else { + temp = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy); + config._a[YEAR] = temp.year; + config._dayOfYear = temp.dayOfYear; + } + } + + // iso 8601 regex + // 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00) + var extendedIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/; + var basicIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/; + + var tzRegex = /Z|[+-]\d\d(?::?\d\d)?/; + + var isoDates = [ + ['YYYYYY-MM-DD', /[+-]\d{6}-\d\d-\d\d/], + ['YYYY-MM-DD', /\d{4}-\d\d-\d\d/], + ['GGGG-[W]WW-E', /\d{4}-W\d\d-\d/], + ['GGGG-[W]WW', /\d{4}-W\d\d/, false], + ['YYYY-DDD', /\d{4}-\d{3}/], + ['YYYY-MM', /\d{4}-\d\d/, false], + ['YYYYYYMMDD', /[+-]\d{10}/], + ['YYYYMMDD', /\d{8}/], + // YYYYMM is NOT allowed by the standard + ['GGGG[W]WWE', /\d{4}W\d{3}/], + ['GGGG[W]WW', /\d{4}W\d{2}/, false], + ['YYYYDDD', /\d{7}/] + ]; + + // iso time formats and regexes + var isoTimes = [ + ['HH:mm:ss.SSSS', /\d\d:\d\d:\d\d\.\d+/], + ['HH:mm:ss,SSSS', /\d\d:\d\d:\d\d,\d+/], + ['HH:mm:ss', /\d\d:\d\d:\d\d/], + ['HH:mm', /\d\d:\d\d/], + ['HHmmss.SSSS', /\d\d\d\d\d\d\.\d+/], + ['HHmmss,SSSS', /\d\d\d\d\d\d,\d+/], + ['HHmmss', /\d\d\d\d\d\d/], + ['HHmm', /\d\d\d\d/], + ['HH', /\d\d/] + ]; + + var aspNetJsonRegex = /^\/?Date\((\-?\d+)/i; + + // date from iso format + function configFromISO(config) { + var i, l, + string = config._i, + match = extendedIsoRegex.exec(string) || basicIsoRegex.exec(string), + allowTime, dateFormat, timeFormat, tzFormat; + + if (match) { + getParsingFlags(config).iso = true; + + for (i = 0, l = isoDates.length; i < l; i++) { + if (isoDates[i][1].exec(match[1])) { + dateFormat = isoDates[i][0]; + allowTime = isoDates[i][2] !== false; + break; + } + } + if (dateFormat == null) { + config._isValid = false; + return; + } + if (match[3]) { + for (i = 0, l = isoTimes.length; i < l; i++) { + if (isoTimes[i][1].exec(match[3])) { + // match[2] should be 'T' or space + timeFormat = (match[2] || ' ') + isoTimes[i][0]; + break; + } + } + if (timeFormat == null) { + config._isValid = false; + return; + } + } + if (!allowTime && timeFormat != null) { + config._isValid = false; + return; + } + if (match[4]) { + if (tzRegex.exec(match[4])) { + tzFormat = 'Z'; + } else { + config._isValid = false; + return; + } + } + config._f = dateFormat + (timeFormat || '') + (tzFormat || ''); + configFromStringAndFormat(config); + } else { + config._isValid = false; + } + } + + // RFC 2822 regex: For details see https://tools.ietf.org/html/rfc2822#section-3.3 + var rfc2822 = /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/; + + function extractFromRFC2822Strings(yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr) { + var result = [ + untruncateYear(yearStr), + defaultLocaleMonthsShort.indexOf(monthStr), + parseInt(dayStr, 10), + parseInt(hourStr, 10), + parseInt(minuteStr, 10) + ]; + + if (secondStr) { + result.push(parseInt(secondStr, 10)); + } + + return result; + } + + function untruncateYear(yearStr) { + var year = parseInt(yearStr, 10); + if (year <= 49) { + return 2000 + year; + } else if (year <= 999) { + return 1900 + year; + } + return year; + } + + function preprocessRFC2822(s) { + // Remove comments and folding whitespace and replace multiple-spaces with a single space + return s.replace(/\([^)]*\)|[\n\t]/g, ' ').replace(/(\s\s+)/g, ' ').replace(/^\s\s*/, '').replace(/\s\s*$/, ''); + } + + function checkWeekday(weekdayStr, parsedInput, config) { + if (weekdayStr) { + // TODO: Replace the vanilla JS Date object with an indepentent day-of-week check. + var weekdayProvided = defaultLocaleWeekdaysShort.indexOf(weekdayStr), + weekdayActual = new Date(parsedInput[0], parsedInput[1], parsedInput[2]).getDay(); + if (weekdayProvided !== weekdayActual) { + getParsingFlags(config).weekdayMismatch = true; + config._isValid = false; + return false; + } + } + return true; + } + + var obsOffsets = { + UT: 0, + GMT: 0, + EDT: -4 * 60, + EST: -5 * 60, + CDT: -5 * 60, + CST: -6 * 60, + MDT: -6 * 60, + MST: -7 * 60, + PDT: -7 * 60, + PST: -8 * 60 + }; + + function calculateOffset(obsOffset, militaryOffset, numOffset) { + if (obsOffset) { + return obsOffsets[obsOffset]; + } else if (militaryOffset) { + // the only allowed military tz is Z + return 0; + } else { + var hm = parseInt(numOffset, 10); + var m = hm % 100, h = (hm - m) / 100; + return h * 60 + m; + } + } + + // date and time from ref 2822 format + function configFromRFC2822(config) { + var match = rfc2822.exec(preprocessRFC2822(config._i)); + if (match) { + var parsedArray = extractFromRFC2822Strings(match[4], match[3], match[2], match[5], match[6], match[7]); + if (!checkWeekday(match[1], parsedArray, config)) { + return; + } + + config._a = parsedArray; + config._tzm = calculateOffset(match[8], match[9], match[10]); + + config._d = createUTCDate.apply(null, config._a); + config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm); + + getParsingFlags(config).rfc2822 = true; + } else { + config._isValid = false; + } + } + + // date from iso format or fallback + function configFromString(config) { + var matched = aspNetJsonRegex.exec(config._i); + + if (matched !== null) { + config._d = new Date(+matched[1]); + return; + } + + configFromISO(config); + if (config._isValid === false) { + delete config._isValid; + } else { + return; + } + + configFromRFC2822(config); + if (config._isValid === false) { + delete config._isValid; + } else { + return; + } + + // Final attempt, use Input Fallback + hooks.createFromInputFallback(config); + } + + hooks.createFromInputFallback = deprecate( + 'value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), ' + + 'which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are ' + + 'discouraged and will be removed in an upcoming major release. Please refer to ' + + 'http://momentjs.com/guides/#/warnings/js-date/ for more info.', + function (config) { + config._d = new Date(config._i + (config._useUTC ? ' UTC' : '')); + } + ); + + // constant that refers to the ISO standard + hooks.ISO_8601 = function () {}; + + // constant that refers to the RFC 2822 form + hooks.RFC_2822 = function () {}; + + // date from string and format string + function configFromStringAndFormat(config) { + // TODO: Move this to another part of the creation flow to prevent circular deps + if (config._f === hooks.ISO_8601) { + configFromISO(config); + return; + } + if (config._f === hooks.RFC_2822) { + configFromRFC2822(config); + return; + } + config._a = []; + getParsingFlags(config).empty = true; + + // This array is used to make a Date, either with `new Date` or `Date.UTC` + var string = '' + config._i, + i, parsedInput, tokens, token, skipped, + stringLength = string.length, + totalParsedInputLength = 0; + + tokens = expandFormat(config._f, config._locale).match(formattingTokens) || []; + + for (i = 0; i < tokens.length; i++) { + token = tokens[i]; + parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0]; + // console.log('token', token, 'parsedInput', parsedInput, + // 'regex', getParseRegexForToken(token, config)); + if (parsedInput) { + skipped = string.substr(0, string.indexOf(parsedInput)); + if (skipped.length > 0) { + getParsingFlags(config).unusedInput.push(skipped); + } + string = string.slice(string.indexOf(parsedInput) + parsedInput.length); + totalParsedInputLength += parsedInput.length; + } + // don't parse if it's not a known token + if (formatTokenFunctions[token]) { + if (parsedInput) { + getParsingFlags(config).empty = false; + } + else { + getParsingFlags(config).unusedTokens.push(token); + } + addTimeToArrayFromToken(token, parsedInput, config); + } + else if (config._strict && !parsedInput) { + getParsingFlags(config).unusedTokens.push(token); + } + } + + // add remaining unparsed input length to the string + getParsingFlags(config).charsLeftOver = stringLength - totalParsedInputLength; + if (string.length > 0) { + getParsingFlags(config).unusedInput.push(string); + } + + // clear _12h flag if hour is <= 12 + if (config._a[HOUR] <= 12 && + getParsingFlags(config).bigHour === true && + config._a[HOUR] > 0) { + getParsingFlags(config).bigHour = undefined; + } + + getParsingFlags(config).parsedDateParts = config._a.slice(0); + getParsingFlags(config).meridiem = config._meridiem; + // handle meridiem + config._a[HOUR] = meridiemFixWrap(config._locale, config._a[HOUR], config._meridiem); + + configFromArray(config); + checkOverflow(config); + } + + + function meridiemFixWrap (locale, hour, meridiem) { + var isPm; + + if (meridiem == null) { + // nothing to do + return hour; + } + if (locale.meridiemHour != null) { + return locale.meridiemHour(hour, meridiem); + } else if (locale.isPM != null) { + // Fallback + isPm = locale.isPM(meridiem); + if (isPm && hour < 12) { + hour += 12; + } + if (!isPm && hour === 12) { + hour = 0; + } + return hour; + } else { + // this is not supposed to happen + return hour; + } + } + + // date from string and array of format strings + function configFromStringAndArray(config) { + var tempConfig, + bestMoment, + + scoreToBeat, + i, + currentScore; + + if (config._f.length === 0) { + getParsingFlags(config).invalidFormat = true; + config._d = new Date(NaN); + return; + } + + for (i = 0; i < config._f.length; i++) { + currentScore = 0; + tempConfig = copyConfig({}, config); + if (config._useUTC != null) { + tempConfig._useUTC = config._useUTC; + } + tempConfig._f = config._f[i]; + configFromStringAndFormat(tempConfig); + + if (!isValid(tempConfig)) { + continue; + } + + // if there is any input that was not parsed add a penalty for that format + currentScore += getParsingFlags(tempConfig).charsLeftOver; + + //or tokens + currentScore += getParsingFlags(tempConfig).unusedTokens.length * 10; + + getParsingFlags(tempConfig).score = currentScore; + + if (scoreToBeat == null || currentScore < scoreToBeat) { + scoreToBeat = currentScore; + bestMoment = tempConfig; + } + } + + extend(config, bestMoment || tempConfig); + } + + function configFromObject(config) { + if (config._d) { + return; + } + + var i = normalizeObjectUnits(config._i); + config._a = map([i.year, i.month, i.day || i.date, i.hour, i.minute, i.second, i.millisecond], function (obj) { + return obj && parseInt(obj, 10); + }); + + configFromArray(config); + } + + function createFromConfig (config) { + var res = new Moment(checkOverflow(prepareConfig(config))); + if (res._nextDay) { + // Adding is smart enough around DST + res.add(1, 'd'); + res._nextDay = undefined; + } + + return res; + } + + function prepareConfig (config) { + var input = config._i, + format = config._f; + + config._locale = config._locale || getLocale(config._l); + + if (input === null || (format === undefined && input === '')) { + return createInvalid({nullInput: true}); + } + + if (typeof input === 'string') { + config._i = input = config._locale.preparse(input); + } + + if (isMoment(input)) { + return new Moment(checkOverflow(input)); + } else if (isDate(input)) { + config._d = input; + } else if (isArray(format)) { + configFromStringAndArray(config); + } else if (format) { + configFromStringAndFormat(config); + } else { + configFromInput(config); + } + + if (!isValid(config)) { + config._d = null; + } + + return config; + } + + function configFromInput(config) { + var input = config._i; + if (isUndefined(input)) { + config._d = new Date(hooks.now()); + } else if (isDate(input)) { + config._d = new Date(input.valueOf()); + } else if (typeof input === 'string') { + configFromString(config); + } else if (isArray(input)) { + config._a = map(input.slice(0), function (obj) { + return parseInt(obj, 10); + }); + configFromArray(config); + } else if (isObject(input)) { + configFromObject(config); + } else if (isNumber(input)) { + // from milliseconds + config._d = new Date(input); + } else { + hooks.createFromInputFallback(config); + } + } + + function createLocalOrUTC (input, format, locale, strict, isUTC) { + var c = {}; + + if (locale === true || locale === false) { + strict = locale; + locale = undefined; + } + + if ((isObject(input) && isObjectEmpty(input)) || + (isArray(input) && input.length === 0)) { + input = undefined; + } + // object construction must be done this way. + // https://github.com/moment/moment/issues/1423 + c._isAMomentObject = true; + c._useUTC = c._isUTC = isUTC; + c._l = locale; + c._i = input; + c._f = format; + c._strict = strict; + + return createFromConfig(c); + } + + function createLocal (input, format, locale, strict) { + return createLocalOrUTC(input, format, locale, strict, false); + } + + var prototypeMin = deprecate( + 'moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/', + function () { + var other = createLocal.apply(null, arguments); + if (this.isValid() && other.isValid()) { + return other < this ? this : other; + } else { + return createInvalid(); + } + } + ); + + var prototypeMax = deprecate( + 'moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/', + function () { + var other = createLocal.apply(null, arguments); + if (this.isValid() && other.isValid()) { + return other > this ? this : other; + } else { + return createInvalid(); + } + } + ); + + // Pick a moment m from moments so that m[fn](other) is true for all + // other. This relies on the function fn to be transitive. + // + // moments should either be an array of moment objects or an array, whose + // first element is an array of moment objects. + function pickBy(fn, moments) { + var res, i; + if (moments.length === 1 && isArray(moments[0])) { + moments = moments[0]; + } + if (!moments.length) { + return createLocal(); + } + res = moments[0]; + for (i = 1; i < moments.length; ++i) { + if (!moments[i].isValid() || moments[i][fn](res)) { + res = moments[i]; + } + } + return res; + } + + // TODO: Use [].sort instead? + function min () { + var args = [].slice.call(arguments, 0); + + return pickBy('isBefore', args); + } + + function max () { + var args = [].slice.call(arguments, 0); + + return pickBy('isAfter', args); + } + + var now = function () { + return Date.now ? Date.now() : +(new Date()); + }; + + var ordering = ['year', 'quarter', 'month', 'week', 'day', 'hour', 'minute', 'second', 'millisecond']; + + function isDurationValid(m) { + for (var key in m) { + if (!(indexOf.call(ordering, key) !== -1 && (m[key] == null || !isNaN(m[key])))) { + return false; + } + } + + var unitHasDecimal = false; + for (var i = 0; i < ordering.length; ++i) { + if (m[ordering[i]]) { + if (unitHasDecimal) { + return false; // only allow non-integers for smallest unit + } + if (parseFloat(m[ordering[i]]) !== toInt(m[ordering[i]])) { + unitHasDecimal = true; + } + } + } + + return true; + } + + function isValid$1() { + return this._isValid; + } + + function createInvalid$1() { + return createDuration(NaN); + } + + function Duration (duration) { + var normalizedInput = normalizeObjectUnits(duration), + years = normalizedInput.year || 0, + quarters = normalizedInput.quarter || 0, + months = normalizedInput.month || 0, + weeks = normalizedInput.week || 0, + days = normalizedInput.day || 0, + hours = normalizedInput.hour || 0, + minutes = normalizedInput.minute || 0, + seconds = normalizedInput.second || 0, + milliseconds = normalizedInput.millisecond || 0; + + this._isValid = isDurationValid(normalizedInput); + + // representation for dateAddRemove + this._milliseconds = +milliseconds + + seconds * 1e3 + // 1000 + minutes * 6e4 + // 1000 * 60 + hours * 1000 * 60 * 60; //using 1000 * 60 * 60 instead of 36e5 to avoid floating point rounding errors https://github.com/moment/moment/issues/2978 + // Because of dateAddRemove treats 24 hours as different from a + // day when working around DST, we need to store them separately + this._days = +days + + weeks * 7; + // It is impossible to translate months into days without knowing + // which months you are are talking about, so we have to store + // it separately. + this._months = +months + + quarters * 3 + + years * 12; + + this._data = {}; + + this._locale = getLocale(); + + this._bubble(); + } + + function isDuration (obj) { + return obj instanceof Duration; + } + + function absRound (number) { + if (number < 0) { + return Math.round(-1 * number) * -1; + } else { + return Math.round(number); + } + } + + // FORMATTING + + function offset (token, separator) { + addFormatToken(token, 0, 0, function () { + var offset = this.utcOffset(); + var sign = '+'; + if (offset < 0) { + offset = -offset; + sign = '-'; + } + return sign + zeroFill(~~(offset / 60), 2) + separator + zeroFill(~~(offset) % 60, 2); + }); + } + + offset('Z', ':'); + offset('ZZ', ''); + + // PARSING + + addRegexToken('Z', matchShortOffset); + addRegexToken('ZZ', matchShortOffset); + addParseToken(['Z', 'ZZ'], function (input, array, config) { + config._useUTC = true; + config._tzm = offsetFromString(matchShortOffset, input); + }); + + // HELPERS + + // timezone chunker + // '+10:00' > ['10', '00'] + // '-1530' > ['-15', '30'] + var chunkOffset = /([\+\-]|\d\d)/gi; + + function offsetFromString(matcher, string) { + var matches = (string || '').match(matcher); + + if (matches === null) { + return null; + } + + var chunk = matches[matches.length - 1] || []; + var parts = (chunk + '').match(chunkOffset) || ['-', 0, 0]; + var minutes = +(parts[1] * 60) + toInt(parts[2]); + + return minutes === 0 ? + 0 : + parts[0] === '+' ? minutes : -minutes; + } + + // Return a moment from input, that is local/utc/zone equivalent to model. + function cloneWithOffset(input, model) { + var res, diff; + if (model._isUTC) { + res = model.clone(); + diff = (isMoment(input) || isDate(input) ? input.valueOf() : createLocal(input).valueOf()) - res.valueOf(); + // Use low-level api, because this fn is low-level api. + res._d.setTime(res._d.valueOf() + diff); + hooks.updateOffset(res, false); + return res; + } else { + return createLocal(input).local(); + } + } + + function getDateOffset (m) { + // On Firefox.24 Date#getTimezoneOffset returns a floating point. + // https://github.com/moment/moment/pull/1871 + return -Math.round(m._d.getTimezoneOffset() / 15) * 15; + } + + // HOOKS + + // This function will be called whenever a moment is mutated. + // It is intended to keep the offset in sync with the timezone. + hooks.updateOffset = function () {}; + + // MOMENTS + + // keepLocalTime = true means only change the timezone, without + // affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]--> + // 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset + // +0200, so we adjust the time as needed, to be valid. + // + // Keeping the time actually adds/subtracts (one hour) + // from the actual represented time. That is why we call updateOffset + // a second time. In case it wants us to change the offset again + // _changeInProgress == true case, then we have to adjust, because + // there is no such time in the given timezone. + function getSetOffset (input, keepLocalTime, keepMinutes) { + var offset = this._offset || 0, + localAdjust; + if (!this.isValid()) { + return input != null ? this : NaN; + } + if (input != null) { + if (typeof input === 'string') { + input = offsetFromString(matchShortOffset, input); + if (input === null) { + return this; + } + } else if (Math.abs(input) < 16 && !keepMinutes) { + input = input * 60; + } + if (!this._isUTC && keepLocalTime) { + localAdjust = getDateOffset(this); + } + this._offset = input; + this._isUTC = true; + if (localAdjust != null) { + this.add(localAdjust, 'm'); + } + if (offset !== input) { + if (!keepLocalTime || this._changeInProgress) { + addSubtract(this, createDuration(input - offset, 'm'), 1, false); + } else if (!this._changeInProgress) { + this._changeInProgress = true; + hooks.updateOffset(this, true); + this._changeInProgress = null; + } + } + return this; + } else { + return this._isUTC ? offset : getDateOffset(this); + } + } + + function getSetZone (input, keepLocalTime) { + if (input != null) { + if (typeof input !== 'string') { + input = -input; + } + + this.utcOffset(input, keepLocalTime); + + return this; + } else { + return -this.utcOffset(); + } + } + + function setOffsetToUTC (keepLocalTime) { + return this.utcOffset(0, keepLocalTime); + } + + function setOffsetToLocal (keepLocalTime) { + if (this._isUTC) { + this.utcOffset(0, keepLocalTime); + this._isUTC = false; + + if (keepLocalTime) { + this.subtract(getDateOffset(this), 'm'); + } + } + return this; + } + + function setOffsetToParsedOffset () { + if (this._tzm != null) { + this.utcOffset(this._tzm, false, true); + } else if (typeof this._i === 'string') { + var tZone = offsetFromString(matchOffset, this._i); + if (tZone != null) { + this.utcOffset(tZone); + } + else { + this.utcOffset(0, true); + } + } + return this; + } + + function hasAlignedHourOffset (input) { + if (!this.isValid()) { + return false; + } + input = input ? createLocal(input).utcOffset() : 0; + + return (this.utcOffset() - input) % 60 === 0; + } + + function isDaylightSavingTime () { + return ( + this.utcOffset() > this.clone().month(0).utcOffset() || + this.utcOffset() > this.clone().month(5).utcOffset() + ); + } + + function isDaylightSavingTimeShifted () { + if (!isUndefined(this._isDSTShifted)) { + return this._isDSTShifted; + } + + var c = {}; + + copyConfig(c, this); + c = prepareConfig(c); + + if (c._a) { + var other = c._isUTC ? createUTC(c._a) : createLocal(c._a); + this._isDSTShifted = this.isValid() && + compareArrays(c._a, other.toArray()) > 0; + } else { + this._isDSTShifted = false; + } + + return this._isDSTShifted; + } + + function isLocal () { + return this.isValid() ? !this._isUTC : false; + } + + function isUtcOffset () { + return this.isValid() ? this._isUTC : false; + } + + function isUtc () { + return this.isValid() ? this._isUTC && this._offset === 0 : false; + } + + // ASP.NET json date format regex + var aspNetRegex = /^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/; + + // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html + // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere + // and further modified to allow for strings containing both week and day + var isoRegex = /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/; + + function createDuration (input, key) { + var duration = input, + // matching against regexp is expensive, do it on demand + match = null, + sign, + ret, + diffRes; + + if (isDuration(input)) { + duration = { + ms : input._milliseconds, + d : input._days, + M : input._months + }; + } else if (isNumber(input)) { + duration = {}; + if (key) { + duration[key] = input; + } else { + duration.milliseconds = input; + } + } else if (!!(match = aspNetRegex.exec(input))) { + sign = (match[1] === '-') ? -1 : 1; + duration = { + y : 0, + d : toInt(match[DATE]) * sign, + h : toInt(match[HOUR]) * sign, + m : toInt(match[MINUTE]) * sign, + s : toInt(match[SECOND]) * sign, + ms : toInt(absRound(match[MILLISECOND] * 1000)) * sign // the millisecond decimal point is included in the match + }; + } else if (!!(match = isoRegex.exec(input))) { + sign = (match[1] === '-') ? -1 : (match[1] === '+') ? 1 : 1; + duration = { + y : parseIso(match[2], sign), + M : parseIso(match[3], sign), + w : parseIso(match[4], sign), + d : parseIso(match[5], sign), + h : parseIso(match[6], sign), + m : parseIso(match[7], sign), + s : parseIso(match[8], sign) + }; + } else if (duration == null) {// checks for null or undefined + duration = {}; + } else if (typeof duration === 'object' && ('from' in duration || 'to' in duration)) { + diffRes = momentsDifference(createLocal(duration.from), createLocal(duration.to)); + + duration = {}; + duration.ms = diffRes.milliseconds; + duration.M = diffRes.months; + } + + ret = new Duration(duration); + + if (isDuration(input) && hasOwnProp(input, '_locale')) { + ret._locale = input._locale; + } + + return ret; + } + + createDuration.fn = Duration.prototype; + createDuration.invalid = createInvalid$1; + + function parseIso (inp, sign) { + // We'd normally use ~~inp for this, but unfortunately it also + // converts floats to ints. + // inp may be undefined, so careful calling replace on it. + var res = inp && parseFloat(inp.replace(',', '.')); + // apply sign while we're at it + return (isNaN(res) ? 0 : res) * sign; + } + + function positiveMomentsDifference(base, other) { + var res = {milliseconds: 0, months: 0}; + + res.months = other.month() - base.month() + + (other.year() - base.year()) * 12; + if (base.clone().add(res.months, 'M').isAfter(other)) { + --res.months; + } + + res.milliseconds = +other - +(base.clone().add(res.months, 'M')); + + return res; + } + + function momentsDifference(base, other) { + var res; + if (!(base.isValid() && other.isValid())) { + return {milliseconds: 0, months: 0}; + } + + other = cloneWithOffset(other, base); + if (base.isBefore(other)) { + res = positiveMomentsDifference(base, other); + } else { + res = positiveMomentsDifference(other, base); + res.milliseconds = -res.milliseconds; + res.months = -res.months; + } + + return res; + } + + // TODO: remove 'name' arg after deprecation is removed + function createAdder(direction, name) { + return function (val, period) { + var dur, tmp; + //invert the arguments, but complain about it + if (period !== null && !isNaN(+period)) { + deprecateSimple(name, 'moment().' + name + '(period, number) is deprecated. Please use moment().' + name + '(number, period). ' + + 'See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info.'); + tmp = val; val = period; period = tmp; + } + + val = typeof val === 'string' ? +val : val; + dur = createDuration(val, period); + addSubtract(this, dur, direction); + return this; + }; + } + + function addSubtract (mom, duration, isAdding, updateOffset) { + var milliseconds = duration._milliseconds, + days = absRound(duration._days), + months = absRound(duration._months); + + if (!mom.isValid()) { + // No op + return; + } + + updateOffset = updateOffset == null ? true : updateOffset; + + if (months) { + setMonth(mom, get(mom, 'Month') + months * isAdding); + } + if (days) { + set$1(mom, 'Date', get(mom, 'Date') + days * isAdding); + } + if (milliseconds) { + mom._d.setTime(mom._d.valueOf() + milliseconds * isAdding); + } + if (updateOffset) { + hooks.updateOffset(mom, days || months); + } + } + + var add = createAdder(1, 'add'); + var subtract = createAdder(-1, 'subtract'); + + function getCalendarFormat(myMoment, now) { + var diff = myMoment.diff(now, 'days', true); + return diff < -6 ? 'sameElse' : + diff < -1 ? 'lastWeek' : + diff < 0 ? 'lastDay' : + diff < 1 ? 'sameDay' : + diff < 2 ? 'nextDay' : + diff < 7 ? 'nextWeek' : 'sameElse'; + } + + function calendar$1 (time, formats) { + // We want to compare the start of today, vs this. + // Getting start-of-today depends on whether we're local/utc/offset or not. + var now = time || createLocal(), + sod = cloneWithOffset(now, this).startOf('day'), + format = hooks.calendarFormat(this, sod) || 'sameElse'; + + var output = formats && (isFunction(formats[format]) ? formats[format].call(this, now) : formats[format]); + + return this.format(output || this.localeData().calendar(format, this, createLocal(now))); + } + + function clone () { + return new Moment(this); + } + + function isAfter (input, units) { + var localInput = isMoment(input) ? input : createLocal(input); + if (!(this.isValid() && localInput.isValid())) { + return false; + } + units = normalizeUnits(!isUndefined(units) ? units : 'millisecond'); + if (units === 'millisecond') { + return this.valueOf() > localInput.valueOf(); + } else { + return localInput.valueOf() < this.clone().startOf(units).valueOf(); + } + } + + function isBefore (input, units) { + var localInput = isMoment(input) ? input : createLocal(input); + if (!(this.isValid() && localInput.isValid())) { + return false; + } + units = normalizeUnits(!isUndefined(units) ? units : 'millisecond'); + if (units === 'millisecond') { + return this.valueOf() < localInput.valueOf(); + } else { + return this.clone().endOf(units).valueOf() < localInput.valueOf(); + } + } + + function isBetween (from, to, units, inclusivity) { + inclusivity = inclusivity || '()'; + return (inclusivity[0] === '(' ? this.isAfter(from, units) : !this.isBefore(from, units)) && + (inclusivity[1] === ')' ? this.isBefore(to, units) : !this.isAfter(to, units)); + } + + function isSame (input, units) { + var localInput = isMoment(input) ? input : createLocal(input), + inputMs; + if (!(this.isValid() && localInput.isValid())) { + return false; + } + units = normalizeUnits(units || 'millisecond'); + if (units === 'millisecond') { + return this.valueOf() === localInput.valueOf(); + } else { + inputMs = localInput.valueOf(); + return this.clone().startOf(units).valueOf() <= inputMs && inputMs <= this.clone().endOf(units).valueOf(); + } + } + + function isSameOrAfter (input, units) { + return this.isSame(input, units) || this.isAfter(input,units); + } + + function isSameOrBefore (input, units) { + return this.isSame(input, units) || this.isBefore(input,units); + } + + function diff (input, units, asFloat) { + var that, + zoneDelta, + output; + + if (!this.isValid()) { + return NaN; + } + + that = cloneWithOffset(input, this); + + if (!that.isValid()) { + return NaN; + } + + zoneDelta = (that.utcOffset() - this.utcOffset()) * 6e4; + + units = normalizeUnits(units); + + switch (units) { + case 'year': output = monthDiff(this, that) / 12; break; + case 'month': output = monthDiff(this, that); break; + case 'quarter': output = monthDiff(this, that) / 3; break; + case 'second': output = (this - that) / 1e3; break; // 1000 + case 'minute': output = (this - that) / 6e4; break; // 1000 * 60 + case 'hour': output = (this - that) / 36e5; break; // 1000 * 60 * 60 + case 'day': output = (this - that - zoneDelta) / 864e5; break; // 1000 * 60 * 60 * 24, negate dst + case 'week': output = (this - that - zoneDelta) / 6048e5; break; // 1000 * 60 * 60 * 24 * 7, negate dst + default: output = this - that; + } + + return asFloat ? output : absFloor(output); + } + + function monthDiff (a, b) { + // difference in months + var wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()), + // b is in (anchor - 1 month, anchor + 1 month) + anchor = a.clone().add(wholeMonthDiff, 'months'), + anchor2, adjust; + + if (b - anchor < 0) { + anchor2 = a.clone().add(wholeMonthDiff - 1, 'months'); + // linear across the month + adjust = (b - anchor) / (anchor - anchor2); + } else { + anchor2 = a.clone().add(wholeMonthDiff + 1, 'months'); + // linear across the month + adjust = (b - anchor) / (anchor2 - anchor); + } + + //check for negative zero, return zero if negative zero + return -(wholeMonthDiff + adjust) || 0; + } + + hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ'; + hooks.defaultFormatUtc = 'YYYY-MM-DDTHH:mm:ss[Z]'; + + function toString () { + return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ'); + } + + function toISOString(keepOffset) { + if (!this.isValid()) { + return null; + } + var utc = keepOffset !== true; + var m = utc ? this.clone().utc() : this; + if (m.year() < 0 || m.year() > 9999) { + return formatMoment(m, utc ? 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYYYY-MM-DD[T]HH:mm:ss.SSSZ'); + } + if (isFunction(Date.prototype.toISOString)) { + // native implementation is ~50x faster, use it when we can + if (utc) { + return this.toDate().toISOString(); + } else { + return new Date(this.valueOf() + this.utcOffset() * 60 * 1000).toISOString().replace('Z', formatMoment(m, 'Z')); + } + } + return formatMoment(m, utc ? 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYY-MM-DD[T]HH:mm:ss.SSSZ'); + } + + /** + * Return a human readable representation of a moment that can + * also be evaluated to get a new moment which is the same + * + * @link https://nodejs.org/dist/latest/docs/api/util.html#util_custom_inspect_function_on_objects + */ + function inspect () { + if (!this.isValid()) { + return 'moment.invalid(/* ' + this._i + ' */)'; + } + var func = 'moment'; + var zone = ''; + if (!this.isLocal()) { + func = this.utcOffset() === 0 ? 'moment.utc' : 'moment.parseZone'; + zone = 'Z'; + } + var prefix = '[' + func + '("]'; + var year = (0 <= this.year() && this.year() <= 9999) ? 'YYYY' : 'YYYYYY'; + var datetime = '-MM-DD[T]HH:mm:ss.SSS'; + var suffix = zone + '[")]'; + + return this.format(prefix + year + datetime + suffix); + } + + function format (inputString) { + if (!inputString) { + inputString = this.isUtc() ? hooks.defaultFormatUtc : hooks.defaultFormat; + } + var output = formatMoment(this, inputString); + return this.localeData().postformat(output); + } + + function from (time, withoutSuffix) { + if (this.isValid() && + ((isMoment(time) && time.isValid()) || + createLocal(time).isValid())) { + return createDuration({to: this, from: time}).locale(this.locale()).humanize(!withoutSuffix); + } else { + return this.localeData().invalidDate(); + } + } + + function fromNow (withoutSuffix) { + return this.from(createLocal(), withoutSuffix); + } + + function to (time, withoutSuffix) { + if (this.isValid() && + ((isMoment(time) && time.isValid()) || + createLocal(time).isValid())) { + return createDuration({from: this, to: time}).locale(this.locale()).humanize(!withoutSuffix); + } else { + return this.localeData().invalidDate(); + } + } + + function toNow (withoutSuffix) { + return this.to(createLocal(), withoutSuffix); + } + + // If passed a locale key, it will set the locale for this + // instance. Otherwise, it will return the locale configuration + // variables for this instance. + function locale (key) { + var newLocaleData; + + if (key === undefined) { + return this._locale._abbr; + } else { + newLocaleData = getLocale(key); + if (newLocaleData != null) { + this._locale = newLocaleData; + } + return this; + } + } + + var lang = deprecate( + 'moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.', + function (key) { + if (key === undefined) { + return this.localeData(); + } else { + return this.locale(key); + } + } + ); + + function localeData () { + return this._locale; + } + + function startOf (units) { + units = normalizeUnits(units); + // the following switch intentionally omits break keywords + // to utilize falling through the cases. + switch (units) { + case 'year': + this.month(0); + /* falls through */ + case 'quarter': + case 'month': + this.date(1); + /* falls through */ + case 'week': + case 'isoWeek': + case 'day': + case 'date': + this.hours(0); + /* falls through */ + case 'hour': + this.minutes(0); + /* falls through */ + case 'minute': + this.seconds(0); + /* falls through */ + case 'second': + this.milliseconds(0); + } + + // weeks are a special case + if (units === 'week') { + this.weekday(0); + } + if (units === 'isoWeek') { + this.isoWeekday(1); + } + + // quarters are also special + if (units === 'quarter') { + this.month(Math.floor(this.month() / 3) * 3); + } + + return this; + } + + function endOf (units) { + units = normalizeUnits(units); + if (units === undefined || units === 'millisecond') { + return this; + } + + // 'date' is an alias for 'day', so it should be considered as such. + if (units === 'date') { + units = 'day'; + } + + return this.startOf(units).add(1, (units === 'isoWeek' ? 'week' : units)).subtract(1, 'ms'); + } + + function valueOf () { + return this._d.valueOf() - ((this._offset || 0) * 60000); + } + + function unix () { + return Math.floor(this.valueOf() / 1000); + } + + function toDate () { + return new Date(this.valueOf()); + } + + function toArray () { + var m = this; + return [m.year(), m.month(), m.date(), m.hour(), m.minute(), m.second(), m.millisecond()]; + } + + function toObject () { + var m = this; + return { + years: m.year(), + months: m.month(), + date: m.date(), + hours: m.hours(), + minutes: m.minutes(), + seconds: m.seconds(), + milliseconds: m.milliseconds() + }; + } + + function toJSON () { + // new Date(NaN).toJSON() === null + return this.isValid() ? this.toISOString() : null; + } + + function isValid$2 () { + return isValid(this); + } + + function parsingFlags () { + return extend({}, getParsingFlags(this)); + } + + function invalidAt () { + return getParsingFlags(this).overflow; + } + + function creationData() { + return { + input: this._i, + format: this._f, + locale: this._locale, + isUTC: this._isUTC, + strict: this._strict + }; + } + + // FORMATTING + + addFormatToken(0, ['gg', 2], 0, function () { + return this.weekYear() % 100; + }); + + addFormatToken(0, ['GG', 2], 0, function () { + return this.isoWeekYear() % 100; + }); + + function addWeekYearFormatToken (token, getter) { + addFormatToken(0, [token, token.length], 0, getter); + } + + addWeekYearFormatToken('gggg', 'weekYear'); + addWeekYearFormatToken('ggggg', 'weekYear'); + addWeekYearFormatToken('GGGG', 'isoWeekYear'); + addWeekYearFormatToken('GGGGG', 'isoWeekYear'); + + // ALIASES + + addUnitAlias('weekYear', 'gg'); + addUnitAlias('isoWeekYear', 'GG'); + + // PRIORITY + + addUnitPriority('weekYear', 1); + addUnitPriority('isoWeekYear', 1); + + + // PARSING + + addRegexToken('G', matchSigned); + addRegexToken('g', matchSigned); + addRegexToken('GG', match1to2, match2); + addRegexToken('gg', match1to2, match2); + addRegexToken('GGGG', match1to4, match4); + addRegexToken('gggg', match1to4, match4); + addRegexToken('GGGGG', match1to6, match6); + addRegexToken('ggggg', match1to6, match6); + + addWeekParseToken(['gggg', 'ggggg', 'GGGG', 'GGGGG'], function (input, week, config, token) { + week[token.substr(0, 2)] = toInt(input); + }); + + addWeekParseToken(['gg', 'GG'], function (input, week, config, token) { + week[token] = hooks.parseTwoDigitYear(input); + }); + + // MOMENTS + + function getSetWeekYear (input) { + return getSetWeekYearHelper.call(this, + input, + this.week(), + this.weekday(), + this.localeData()._week.dow, + this.localeData()._week.doy); + } + + function getSetISOWeekYear (input) { + return getSetWeekYearHelper.call(this, + input, this.isoWeek(), this.isoWeekday(), 1, 4); + } + + function getISOWeeksInYear () { + return weeksInYear(this.year(), 1, 4); + } + + function getWeeksInYear () { + var weekInfo = this.localeData()._week; + return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy); + } + + function getSetWeekYearHelper(input, week, weekday, dow, doy) { + var weeksTarget; + if (input == null) { + return weekOfYear(this, dow, doy).year; + } else { + weeksTarget = weeksInYear(input, dow, doy); + if (week > weeksTarget) { + week = weeksTarget; + } + return setWeekAll.call(this, input, week, weekday, dow, doy); + } + } + + function setWeekAll(weekYear, week, weekday, dow, doy) { + var dayOfYearData = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy), + date = createUTCDate(dayOfYearData.year, 0, dayOfYearData.dayOfYear); + + this.year(date.getUTCFullYear()); + this.month(date.getUTCMonth()); + this.date(date.getUTCDate()); + return this; + } + + // FORMATTING + + addFormatToken('Q', 0, 'Qo', 'quarter'); + + // ALIASES + + addUnitAlias('quarter', 'Q'); + + // PRIORITY + + addUnitPriority('quarter', 7); + + // PARSING + + addRegexToken('Q', match1); + addParseToken('Q', function (input, array) { + array[MONTH] = (toInt(input) - 1) * 3; + }); + + // MOMENTS + + function getSetQuarter (input) { + return input == null ? Math.ceil((this.month() + 1) / 3) : this.month((input - 1) * 3 + this.month() % 3); + } + + // FORMATTING + + addFormatToken('D', ['DD', 2], 'Do', 'date'); + + // ALIASES + + addUnitAlias('date', 'D'); + + // PRIORITY + addUnitPriority('date', 9); + + // PARSING + + addRegexToken('D', match1to2); + addRegexToken('DD', match1to2, match2); + addRegexToken('Do', function (isStrict, locale) { + // TODO: Remove "ordinalParse" fallback in next major release. + return isStrict ? + (locale._dayOfMonthOrdinalParse || locale._ordinalParse) : + locale._dayOfMonthOrdinalParseLenient; + }); + + addParseToken(['D', 'DD'], DATE); + addParseToken('Do', function (input, array) { + array[DATE] = toInt(input.match(match1to2)[0]); + }); + + // MOMENTS + + var getSetDayOfMonth = makeGetSet('Date', true); + + // FORMATTING + + addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear'); + + // ALIASES + + addUnitAlias('dayOfYear', 'DDD'); + + // PRIORITY + addUnitPriority('dayOfYear', 4); + + // PARSING + + addRegexToken('DDD', match1to3); + addRegexToken('DDDD', match3); + addParseToken(['DDD', 'DDDD'], function (input, array, config) { + config._dayOfYear = toInt(input); + }); + + // HELPERS + + // MOMENTS + + function getSetDayOfYear (input) { + var dayOfYear = Math.round((this.clone().startOf('day') - this.clone().startOf('year')) / 864e5) + 1; + return input == null ? dayOfYear : this.add((input - dayOfYear), 'd'); + } + + // FORMATTING + + addFormatToken('m', ['mm', 2], 0, 'minute'); + + // ALIASES + + addUnitAlias('minute', 'm'); + + // PRIORITY + + addUnitPriority('minute', 14); + + // PARSING + + addRegexToken('m', match1to2); + addRegexToken('mm', match1to2, match2); + addParseToken(['m', 'mm'], MINUTE); + + // MOMENTS + + var getSetMinute = makeGetSet('Minutes', false); + + // FORMATTING + + addFormatToken('s', ['ss', 2], 0, 'second'); + + // ALIASES + + addUnitAlias('second', 's'); + + // PRIORITY + + addUnitPriority('second', 15); + + // PARSING + + addRegexToken('s', match1to2); + addRegexToken('ss', match1to2, match2); + addParseToken(['s', 'ss'], SECOND); + + // MOMENTS + + var getSetSecond = makeGetSet('Seconds', false); + + // FORMATTING + + addFormatToken('S', 0, 0, function () { + return ~~(this.millisecond() / 100); + }); + + addFormatToken(0, ['SS', 2], 0, function () { + return ~~(this.millisecond() / 10); + }); + + addFormatToken(0, ['SSS', 3], 0, 'millisecond'); + addFormatToken(0, ['SSSS', 4], 0, function () { + return this.millisecond() * 10; + }); + addFormatToken(0, ['SSSSS', 5], 0, function () { + return this.millisecond() * 100; + }); + addFormatToken(0, ['SSSSSS', 6], 0, function () { + return this.millisecond() * 1000; + }); + addFormatToken(0, ['SSSSSSS', 7], 0, function () { + return this.millisecond() * 10000; + }); + addFormatToken(0, ['SSSSSSSS', 8], 0, function () { + return this.millisecond() * 100000; + }); + addFormatToken(0, ['SSSSSSSSS', 9], 0, function () { + return this.millisecond() * 1000000; + }); + + + // ALIASES + + addUnitAlias('millisecond', 'ms'); + + // PRIORITY + + addUnitPriority('millisecond', 16); + + // PARSING + + addRegexToken('S', match1to3, match1); + addRegexToken('SS', match1to3, match2); + addRegexToken('SSS', match1to3, match3); + + var token; + for (token = 'SSSS'; token.length <= 9; token += 'S') { + addRegexToken(token, matchUnsigned); + } + + function parseMs(input, array) { + array[MILLISECOND] = toInt(('0.' + input) * 1000); + } + + for (token = 'S'; token.length <= 9; token += 'S') { + addParseToken(token, parseMs); + } + // MOMENTS + + var getSetMillisecond = makeGetSet('Milliseconds', false); + + // FORMATTING + + addFormatToken('z', 0, 0, 'zoneAbbr'); + addFormatToken('zz', 0, 0, 'zoneName'); + + // MOMENTS + + function getZoneAbbr () { + return this._isUTC ? 'UTC' : ''; + } + + function getZoneName () { + return this._isUTC ? 'Coordinated Universal Time' : ''; + } + + var proto = Moment.prototype; + + proto.add = add; + proto.calendar = calendar$1; + proto.clone = clone; + proto.diff = diff; + proto.endOf = endOf; + proto.format = format; + proto.from = from; + proto.fromNow = fromNow; + proto.to = to; + proto.toNow = toNow; + proto.get = stringGet; + proto.invalidAt = invalidAt; + proto.isAfter = isAfter; + proto.isBefore = isBefore; + proto.isBetween = isBetween; + proto.isSame = isSame; + proto.isSameOrAfter = isSameOrAfter; + proto.isSameOrBefore = isSameOrBefore; + proto.isValid = isValid$2; + proto.lang = lang; + proto.locale = locale; + proto.localeData = localeData; + proto.max = prototypeMax; + proto.min = prototypeMin; + proto.parsingFlags = parsingFlags; + proto.set = stringSet; + proto.startOf = startOf; + proto.subtract = subtract; + proto.toArray = toArray; + proto.toObject = toObject; + proto.toDate = toDate; + proto.toISOString = toISOString; + proto.inspect = inspect; + proto.toJSON = toJSON; + proto.toString = toString; + proto.unix = unix; + proto.valueOf = valueOf; + proto.creationData = creationData; + proto.year = getSetYear; + proto.isLeapYear = getIsLeapYear; + proto.weekYear = getSetWeekYear; + proto.isoWeekYear = getSetISOWeekYear; + proto.quarter = proto.quarters = getSetQuarter; + proto.month = getSetMonth; + proto.daysInMonth = getDaysInMonth; + proto.week = proto.weeks = getSetWeek; + proto.isoWeek = proto.isoWeeks = getSetISOWeek; + proto.weeksInYear = getWeeksInYear; + proto.isoWeeksInYear = getISOWeeksInYear; + proto.date = getSetDayOfMonth; + proto.day = proto.days = getSetDayOfWeek; + proto.weekday = getSetLocaleDayOfWeek; + proto.isoWeekday = getSetISODayOfWeek; + proto.dayOfYear = getSetDayOfYear; + proto.hour = proto.hours = getSetHour; + proto.minute = proto.minutes = getSetMinute; + proto.second = proto.seconds = getSetSecond; + proto.millisecond = proto.milliseconds = getSetMillisecond; + proto.utcOffset = getSetOffset; + proto.utc = setOffsetToUTC; + proto.local = setOffsetToLocal; + proto.parseZone = setOffsetToParsedOffset; + proto.hasAlignedHourOffset = hasAlignedHourOffset; + proto.isDST = isDaylightSavingTime; + proto.isLocal = isLocal; + proto.isUtcOffset = isUtcOffset; + proto.isUtc = isUtc; + proto.isUTC = isUtc; + proto.zoneAbbr = getZoneAbbr; + proto.zoneName = getZoneName; + proto.dates = deprecate('dates accessor is deprecated. Use date instead.', getSetDayOfMonth); + proto.months = deprecate('months accessor is deprecated. Use month instead', getSetMonth); + proto.years = deprecate('years accessor is deprecated. Use year instead', getSetYear); + proto.zone = deprecate('moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/', getSetZone); + proto.isDSTShifted = deprecate('isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information', isDaylightSavingTimeShifted); + + function createUnix (input) { + return createLocal(input * 1000); + } + + function createInZone () { + return createLocal.apply(null, arguments).parseZone(); + } + + function preParsePostFormat (string) { + return string; + } + + var proto$1 = Locale.prototype; + + proto$1.calendar = calendar; + proto$1.longDateFormat = longDateFormat; + proto$1.invalidDate = invalidDate; + proto$1.ordinal = ordinal; + proto$1.preparse = preParsePostFormat; + proto$1.postformat = preParsePostFormat; + proto$1.relativeTime = relativeTime; + proto$1.pastFuture = pastFuture; + proto$1.set = set; + + proto$1.months = localeMonths; + proto$1.monthsShort = localeMonthsShort; + proto$1.monthsParse = localeMonthsParse; + proto$1.monthsRegex = monthsRegex; + proto$1.monthsShortRegex = monthsShortRegex; + proto$1.week = localeWeek; + proto$1.firstDayOfYear = localeFirstDayOfYear; + proto$1.firstDayOfWeek = localeFirstDayOfWeek; + + proto$1.weekdays = localeWeekdays; + proto$1.weekdaysMin = localeWeekdaysMin; + proto$1.weekdaysShort = localeWeekdaysShort; + proto$1.weekdaysParse = localeWeekdaysParse; + + proto$1.weekdaysRegex = weekdaysRegex; + proto$1.weekdaysShortRegex = weekdaysShortRegex; + proto$1.weekdaysMinRegex = weekdaysMinRegex; + + proto$1.isPM = localeIsPM; + proto$1.meridiem = localeMeridiem; + + function get$1 (format, index, field, setter) { + var locale = getLocale(); + var utc = createUTC().set(setter, index); + return locale[field](utc, format); + } + + function listMonthsImpl (format, index, field) { + if (isNumber(format)) { + index = format; + format = undefined; + } + + format = format || ''; + + if (index != null) { + return get$1(format, index, field, 'month'); + } + + var i; + var out = []; + for (i = 0; i < 12; i++) { + out[i] = get$1(format, i, field, 'month'); + } + return out; + } + + // () + // (5) + // (fmt, 5) + // (fmt) + // (true) + // (true, 5) + // (true, fmt, 5) + // (true, fmt) + function listWeekdaysImpl (localeSorted, format, index, field) { + if (typeof localeSorted === 'boolean') { + if (isNumber(format)) { + index = format; + format = undefined; + } + + format = format || ''; + } else { + format = localeSorted; + index = format; + localeSorted = false; + + if (isNumber(format)) { + index = format; + format = undefined; + } + + format = format || ''; + } + + var locale = getLocale(), + shift = localeSorted ? locale._week.dow : 0; + + if (index != null) { + return get$1(format, (index + shift) % 7, field, 'day'); + } + + var i; + var out = []; + for (i = 0; i < 7; i++) { + out[i] = get$1(format, (i + shift) % 7, field, 'day'); + } + return out; + } + + function listMonths (format, index) { + return listMonthsImpl(format, index, 'months'); + } + + function listMonthsShort (format, index) { + return listMonthsImpl(format, index, 'monthsShort'); + } + + function listWeekdays (localeSorted, format, index) { + return listWeekdaysImpl(localeSorted, format, index, 'weekdays'); + } + + function listWeekdaysShort (localeSorted, format, index) { + return listWeekdaysImpl(localeSorted, format, index, 'weekdaysShort'); + } + + function listWeekdaysMin (localeSorted, format, index) { + return listWeekdaysImpl(localeSorted, format, index, 'weekdaysMin'); + } + + getSetGlobalLocale('en', { + dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/, + ordinal : function (number) { + var b = number % 10, + output = (toInt(number % 100 / 10) === 1) ? 'th' : + (b === 1) ? 'st' : + (b === 2) ? 'nd' : + (b === 3) ? 'rd' : 'th'; + return number + output; + } + }); + + // Side effect imports + + hooks.lang = deprecate('moment.lang is deprecated. Use moment.locale instead.', getSetGlobalLocale); + hooks.langData = deprecate('moment.langData is deprecated. Use moment.localeData instead.', getLocale); + + var mathAbs = Math.abs; + + function abs () { + var data = this._data; + + this._milliseconds = mathAbs(this._milliseconds); + this._days = mathAbs(this._days); + this._months = mathAbs(this._months); + + data.milliseconds = mathAbs(data.milliseconds); + data.seconds = mathAbs(data.seconds); + data.minutes = mathAbs(data.minutes); + data.hours = mathAbs(data.hours); + data.months = mathAbs(data.months); + data.years = mathAbs(data.years); + + return this; + } + + function addSubtract$1 (duration, input, value, direction) { + var other = createDuration(input, value); + + duration._milliseconds += direction * other._milliseconds; + duration._days += direction * other._days; + duration._months += direction * other._months; + + return duration._bubble(); + } + + // supports only 2.0-style add(1, 's') or add(duration) + function add$1 (input, value) { + return addSubtract$1(this, input, value, 1); + } + + // supports only 2.0-style subtract(1, 's') or subtract(duration) + function subtract$1 (input, value) { + return addSubtract$1(this, input, value, -1); + } + + function absCeil (number) { + if (number < 0) { + return Math.floor(number); + } else { + return Math.ceil(number); + } + } + + function bubble () { + var milliseconds = this._milliseconds; + var days = this._days; + var months = this._months; + var data = this._data; + var seconds, minutes, hours, years, monthsFromDays; + + // if we have a mix of positive and negative values, bubble down first + // check: https://github.com/moment/moment/issues/2166 + if (!((milliseconds >= 0 && days >= 0 && months >= 0) || + (milliseconds <= 0 && days <= 0 && months <= 0))) { + milliseconds += absCeil(monthsToDays(months) + days) * 864e5; + days = 0; + months = 0; + } + + // The following code bubbles up values, see the tests for + // examples of what that means. + data.milliseconds = milliseconds % 1000; + + seconds = absFloor(milliseconds / 1000); + data.seconds = seconds % 60; + + minutes = absFloor(seconds / 60); + data.minutes = minutes % 60; + + hours = absFloor(minutes / 60); + data.hours = hours % 24; + + days += absFloor(hours / 24); + + // convert days to months + monthsFromDays = absFloor(daysToMonths(days)); + months += monthsFromDays; + days -= absCeil(monthsToDays(monthsFromDays)); + + // 12 months -> 1 year + years = absFloor(months / 12); + months %= 12; + + data.days = days; + data.months = months; + data.years = years; + + return this; + } + + function daysToMonths (days) { + // 400 years have 146097 days (taking into account leap year rules) + // 400 years have 12 months === 4800 + return days * 4800 / 146097; + } + + function monthsToDays (months) { + // the reverse of daysToMonths + return months * 146097 / 4800; + } + + function as (units) { + if (!this.isValid()) { + return NaN; + } + var days; + var months; + var milliseconds = this._milliseconds; + + units = normalizeUnits(units); + + if (units === 'month' || units === 'year') { + days = this._days + milliseconds / 864e5; + months = this._months + daysToMonths(days); + return units === 'month' ? months : months / 12; + } else { + // handle milliseconds separately because of floating point math errors (issue #1867) + days = this._days + Math.round(monthsToDays(this._months)); + switch (units) { + case 'week' : return days / 7 + milliseconds / 6048e5; + case 'day' : return days + milliseconds / 864e5; + case 'hour' : return days * 24 + milliseconds / 36e5; + case 'minute' : return days * 1440 + milliseconds / 6e4; + case 'second' : return days * 86400 + milliseconds / 1000; + // Math.floor prevents floating point math errors here + case 'millisecond': return Math.floor(days * 864e5) + milliseconds; + default: throw new Error('Unknown unit ' + units); + } + } + } + + // TODO: Use this.as('ms')? + function valueOf$1 () { + if (!this.isValid()) { + return NaN; + } + return ( + this._milliseconds + + this._days * 864e5 + + (this._months % 12) * 2592e6 + + toInt(this._months / 12) * 31536e6 + ); + } + + function makeAs (alias) { + return function () { + return this.as(alias); + }; + } + + var asMilliseconds = makeAs('ms'); + var asSeconds = makeAs('s'); + var asMinutes = makeAs('m'); + var asHours = makeAs('h'); + var asDays = makeAs('d'); + var asWeeks = makeAs('w'); + var asMonths = makeAs('M'); + var asYears = makeAs('y'); + + function clone$1 () { + return createDuration(this); + } + + function get$2 (units) { + units = normalizeUnits(units); + return this.isValid() ? this[units + 's']() : NaN; + } + + function makeGetter(name) { + return function () { + return this.isValid() ? this._data[name] : NaN; + }; + } + + var milliseconds = makeGetter('milliseconds'); + var seconds = makeGetter('seconds'); + var minutes = makeGetter('minutes'); + var hours = makeGetter('hours'); + var days = makeGetter('days'); + var months = makeGetter('months'); + var years = makeGetter('years'); + + function weeks () { + return absFloor(this.days() / 7); + } + + var round = Math.round; + var thresholds = { + ss: 44, // a few seconds to seconds + s : 45, // seconds to minute + m : 45, // minutes to hour + h : 22, // hours to day + d : 26, // days to month + M : 11 // months to year + }; + + // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize + function substituteTimeAgo(string, number, withoutSuffix, isFuture, locale) { + return locale.relativeTime(number || 1, !!withoutSuffix, string, isFuture); + } + + function relativeTime$1 (posNegDuration, withoutSuffix, locale) { + var duration = createDuration(posNegDuration).abs(); + var seconds = round(duration.as('s')); + var minutes = round(duration.as('m')); + var hours = round(duration.as('h')); + var days = round(duration.as('d')); + var months = round(duration.as('M')); + var years = round(duration.as('y')); + + var a = seconds <= thresholds.ss && ['s', seconds] || + seconds < thresholds.s && ['ss', seconds] || + minutes <= 1 && ['m'] || + minutes < thresholds.m && ['mm', minutes] || + hours <= 1 && ['h'] || + hours < thresholds.h && ['hh', hours] || + days <= 1 && ['d'] || + days < thresholds.d && ['dd', days] || + months <= 1 && ['M'] || + months < thresholds.M && ['MM', months] || + years <= 1 && ['y'] || ['yy', years]; + + a[2] = withoutSuffix; + a[3] = +posNegDuration > 0; + a[4] = locale; + return substituteTimeAgo.apply(null, a); + } + + // This function allows you to set the rounding function for relative time strings + function getSetRelativeTimeRounding (roundingFunction) { + if (roundingFunction === undefined) { + return round; + } + if (typeof(roundingFunction) === 'function') { + round = roundingFunction; + return true; + } + return false; + } + + // This function allows you to set a threshold for relative time strings + function getSetRelativeTimeThreshold (threshold, limit) { + if (thresholds[threshold] === undefined) { + return false; + } + if (limit === undefined) { + return thresholds[threshold]; + } + thresholds[threshold] = limit; + if (threshold === 's') { + thresholds.ss = limit - 1; + } + return true; + } + + function humanize (withSuffix) { + if (!this.isValid()) { + return this.localeData().invalidDate(); + } + + var locale = this.localeData(); + var output = relativeTime$1(this, !withSuffix, locale); + + if (withSuffix) { + output = locale.pastFuture(+this, output); + } + + return locale.postformat(output); + } + + var abs$1 = Math.abs; + + function sign(x) { + return ((x > 0) - (x < 0)) || +x; + } + + function toISOString$1() { + // for ISO strings we do not use the normal bubbling rules: + // * milliseconds bubble up until they become hours + // * days do not bubble at all + // * months bubble up until they become years + // This is because there is no context-free conversion between hours and days + // (think of clock changes) + // and also not between days and months (28-31 days per month) + if (!this.isValid()) { + return this.localeData().invalidDate(); + } + + var seconds = abs$1(this._milliseconds) / 1000; + var days = abs$1(this._days); + var months = abs$1(this._months); + var minutes, hours, years; + + // 3600 seconds -> 60 minutes -> 1 hour + minutes = absFloor(seconds / 60); + hours = absFloor(minutes / 60); + seconds %= 60; + minutes %= 60; + + // 12 months -> 1 year + years = absFloor(months / 12); + months %= 12; + + + // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js + var Y = years; + var M = months; + var D = days; + var h = hours; + var m = minutes; + var s = seconds ? seconds.toFixed(3).replace(/\.?0+$/, '') : ''; + var total = this.asSeconds(); + + if (!total) { + // this is the same as C#'s (Noda) and python (isodate)... + // but not other JS (goog.date) + return 'P0D'; + } + + var totalSign = total < 0 ? '-' : ''; + var ymSign = sign(this._months) !== sign(total) ? '-' : ''; + var daysSign = sign(this._days) !== sign(total) ? '-' : ''; + var hmsSign = sign(this._milliseconds) !== sign(total) ? '-' : ''; + + return totalSign + 'P' + + (Y ? ymSign + Y + 'Y' : '') + + (M ? ymSign + M + 'M' : '') + + (D ? daysSign + D + 'D' : '') + + ((h || m || s) ? 'T' : '') + + (h ? hmsSign + h + 'H' : '') + + (m ? hmsSign + m + 'M' : '') + + (s ? hmsSign + s + 'S' : ''); + } + + var proto$2 = Duration.prototype; + + proto$2.isValid = isValid$1; + proto$2.abs = abs; + proto$2.add = add$1; + proto$2.subtract = subtract$1; + proto$2.as = as; + proto$2.asMilliseconds = asMilliseconds; + proto$2.asSeconds = asSeconds; + proto$2.asMinutes = asMinutes; + proto$2.asHours = asHours; + proto$2.asDays = asDays; + proto$2.asWeeks = asWeeks; + proto$2.asMonths = asMonths; + proto$2.asYears = asYears; + proto$2.valueOf = valueOf$1; + proto$2._bubble = bubble; + proto$2.clone = clone$1; + proto$2.get = get$2; + proto$2.milliseconds = milliseconds; + proto$2.seconds = seconds; + proto$2.minutes = minutes; + proto$2.hours = hours; + proto$2.days = days; + proto$2.weeks = weeks; + proto$2.months = months; + proto$2.years = years; + proto$2.humanize = humanize; + proto$2.toISOString = toISOString$1; + proto$2.toString = toISOString$1; + proto$2.toJSON = toISOString$1; + proto$2.locale = locale; + proto$2.localeData = localeData; + + proto$2.toIsoString = deprecate('toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)', toISOString$1); + proto$2.lang = lang; + + // Side effect imports + + // FORMATTING + + addFormatToken('X', 0, 0, 'unix'); + addFormatToken('x', 0, 0, 'valueOf'); + + // PARSING + + addRegexToken('x', matchSigned); + addRegexToken('X', matchTimestamp); + addParseToken('X', function (input, array, config) { + config._d = new Date(parseFloat(input, 10) * 1000); + }); + addParseToken('x', function (input, array, config) { + config._d = new Date(toInt(input)); + }); + + // Side effect imports + + + hooks.version = '2.22.2'; + + setHookCallback(createLocal); + + hooks.fn = proto; + hooks.min = min; + hooks.max = max; + hooks.now = now; + hooks.utc = createUTC; + hooks.unix = createUnix; + hooks.months = listMonths; + hooks.isDate = isDate; + hooks.locale = getSetGlobalLocale; + hooks.invalid = createInvalid; + hooks.duration = createDuration; + hooks.isMoment = isMoment; + hooks.weekdays = listWeekdays; + hooks.parseZone = createInZone; + hooks.localeData = getLocale; + hooks.isDuration = isDuration; + hooks.monthsShort = listMonthsShort; + hooks.weekdaysMin = listWeekdaysMin; + hooks.defineLocale = defineLocale; + hooks.updateLocale = updateLocale; + hooks.locales = listLocales; + hooks.weekdaysShort = listWeekdaysShort; + hooks.normalizeUnits = normalizeUnits; + hooks.relativeTimeRounding = getSetRelativeTimeRounding; + hooks.relativeTimeThreshold = getSetRelativeTimeThreshold; + hooks.calendarFormat = getCalendarFormat; + hooks.prototype = proto; + + // currently HTML5 input type only supports 24-hour formats + hooks.HTML5_FMT = { + DATETIME_LOCAL: 'YYYY-MM-DDTHH:mm', // + DATETIME_LOCAL_SECONDS: 'YYYY-MM-DDTHH:mm:ss', // + DATETIME_LOCAL_MS: 'YYYY-MM-DDTHH:mm:ss.SSS', // + DATE: 'YYYY-MM-DD', // + TIME: 'HH:mm', // + TIME_SECONDS: 'HH:mm:ss', // + TIME_MS: 'HH:mm:ss.SSS', // + WEEK: 'YYYY-[W]WW', // + MONTH: 'YYYY-MM' // + }; + + return hooks; + +}))); \ No newline at end of file diff --git a/bower_components/underscore/underscore.js b/bower_components/underscore/underscore.js new file mode 100644 index 0000000..9174010 --- /dev/null +++ b/bower_components/underscore/underscore.js @@ -0,0 +1,1692 @@ +// Underscore.js 1.9.1 +// http://underscorejs.org +// (c) 2009-2018 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors +// Underscore may be freely distributed under the MIT license. + +(function() { + + // Baseline setup + // -------------- + + // Establish the root object, `window` (`self`) in the browser, `global` + // on the server, or `this` in some virtual machines. We use `self` + // instead of `window` for `WebWorker` support. + var root = typeof self == 'object' && self.self === self && self || + typeof global == 'object' && global.global === global && global || + this || + {}; + + // Save the previous value of the `_` variable. + var previousUnderscore = root._; + + // Save bytes in the minified (but not gzipped) version: + var ArrayProto = Array.prototype, ObjProto = Object.prototype; + var SymbolProto = typeof Symbol !== 'undefined' ? Symbol.prototype : null; + + // Create quick reference variables for speed access to core prototypes. + var push = ArrayProto.push, + slice = ArrayProto.slice, + toString = ObjProto.toString, + hasOwnProperty = ObjProto.hasOwnProperty; + + // All **ECMAScript 5** native function implementations that we hope to use + // are declared here. + var nativeIsArray = Array.isArray, + nativeKeys = Object.keys, + nativeCreate = Object.create; + + // Naked function reference for surrogate-prototype-swapping. + var Ctor = function(){}; + + // Create a safe reference to the Underscore object for use below. + var _ = function(obj) { + if (obj instanceof _) return obj; + if (!(this instanceof _)) return new _(obj); + this._wrapped = obj; + }; + + // Export the Underscore object for **Node.js**, with + // backwards-compatibility for their old module API. If we're in + // the browser, add `_` as a global object. + // (`nodeType` is checked to ensure that `module` + // and `exports` are not HTML elements.) + if (typeof exports != 'undefined' && !exports.nodeType) { + if (typeof module != 'undefined' && !module.nodeType && module.exports) { + exports = module.exports = _; + } + exports._ = _; + } else { + root._ = _; + } + + // Current version. + _.VERSION = '1.9.1'; + + // Internal function that returns an efficient (for current engines) version + // of the passed-in callback, to be repeatedly applied in other Underscore + // functions. + var optimizeCb = function(func, context, argCount) { + if (context === void 0) return func; + switch (argCount == null ? 3 : argCount) { + case 1: return function(value) { + return func.call(context, value); + }; + // The 2-argument case is omitted because we’re not using it. + case 3: return function(value, index, collection) { + return func.call(context, value, index, collection); + }; + case 4: return function(accumulator, value, index, collection) { + return func.call(context, accumulator, value, index, collection); + }; + } + return function() { + return func.apply(context, arguments); + }; + }; + + var builtinIteratee; + + // An internal function to generate callbacks that can be applied to each + // element in a collection, returning the desired result — either `identity`, + // an arbitrary callback, a property matcher, or a property accessor. + var cb = function(value, context, argCount) { + if (_.iteratee !== builtinIteratee) return _.iteratee(value, context); + if (value == null) return _.identity; + if (_.isFunction(value)) return optimizeCb(value, context, argCount); + if (_.isObject(value) && !_.isArray(value)) return _.matcher(value); + return _.property(value); + }; + + // External wrapper for our callback generator. Users may customize + // `_.iteratee` if they want additional predicate/iteratee shorthand styles. + // This abstraction hides the internal-only argCount argument. + _.iteratee = builtinIteratee = function(value, context) { + return cb(value, context, Infinity); + }; + + // Some functions take a variable number of arguments, or a few expected + // arguments at the beginning and then a variable number of values to operate + // on. This helper accumulates all remaining arguments past the function’s + // argument length (or an explicit `startIndex`), into an array that becomes + // the last argument. Similar to ES6’s "rest parameter". + var restArguments = function(func, startIndex) { + startIndex = startIndex == null ? func.length - 1 : +startIndex; + return function() { + var length = Math.max(arguments.length - startIndex, 0), + rest = Array(length), + index = 0; + for (; index < length; index++) { + rest[index] = arguments[index + startIndex]; + } + switch (startIndex) { + case 0: return func.call(this, rest); + case 1: return func.call(this, arguments[0], rest); + case 2: return func.call(this, arguments[0], arguments[1], rest); + } + var args = Array(startIndex + 1); + for (index = 0; index < startIndex; index++) { + args[index] = arguments[index]; + } + args[startIndex] = rest; + return func.apply(this, args); + }; + }; + + // An internal function for creating a new object that inherits from another. + var baseCreate = function(prototype) { + if (!_.isObject(prototype)) return {}; + if (nativeCreate) return nativeCreate(prototype); + Ctor.prototype = prototype; + var result = new Ctor; + Ctor.prototype = null; + return result; + }; + + var shallowProperty = function(key) { + return function(obj) { + return obj == null ? void 0 : obj[key]; + }; + }; + + var has = function(obj, path) { + return obj != null && hasOwnProperty.call(obj, path); + } + + var deepGet = function(obj, path) { + var length = path.length; + for (var i = 0; i < length; i++) { + if (obj == null) return void 0; + obj = obj[path[i]]; + } + return length ? obj : void 0; + }; + + // Helper for collection methods to determine whether a collection + // should be iterated as an array or as an object. + // Related: http://people.mozilla.org/~jorendorff/es6-draft.html#sec-tolength + // Avoids a very nasty iOS 8 JIT bug on ARM-64. #2094 + var MAX_ARRAY_INDEX = Math.pow(2, 53) - 1; + var getLength = shallowProperty('length'); + var isArrayLike = function(collection) { + var length = getLength(collection); + return typeof length == 'number' && length >= 0 && length <= MAX_ARRAY_INDEX; + }; + + // Collection Functions + // -------------------- + + // The cornerstone, an `each` implementation, aka `forEach`. + // Handles raw objects in addition to array-likes. Treats all + // sparse array-likes as if they were dense. + _.each = _.forEach = function(obj, iteratee, context) { + iteratee = optimizeCb(iteratee, context); + var i, length; + if (isArrayLike(obj)) { + for (i = 0, length = obj.length; i < length; i++) { + iteratee(obj[i], i, obj); + } + } else { + var keys = _.keys(obj); + for (i = 0, length = keys.length; i < length; i++) { + iteratee(obj[keys[i]], keys[i], obj); + } + } + return obj; + }; + + // Return the results of applying the iteratee to each element. + _.map = _.collect = function(obj, iteratee, context) { + iteratee = cb(iteratee, context); + var keys = !isArrayLike(obj) && _.keys(obj), + length = (keys || obj).length, + results = Array(length); + for (var index = 0; index < length; index++) { + var currentKey = keys ? keys[index] : index; + results[index] = iteratee(obj[currentKey], currentKey, obj); + } + return results; + }; + + // Create a reducing function iterating left or right. + var createReduce = function(dir) { + // Wrap code that reassigns argument variables in a separate function than + // the one that accesses `arguments.length` to avoid a perf hit. (#1991) + var reducer = function(obj, iteratee, memo, initial) { + var keys = !isArrayLike(obj) && _.keys(obj), + length = (keys || obj).length, + index = dir > 0 ? 0 : length - 1; + if (!initial) { + memo = obj[keys ? keys[index] : index]; + index += dir; + } + for (; index >= 0 && index < length; index += dir) { + var currentKey = keys ? keys[index] : index; + memo = iteratee(memo, obj[currentKey], currentKey, obj); + } + return memo; + }; + + return function(obj, iteratee, memo, context) { + var initial = arguments.length >= 3; + return reducer(obj, optimizeCb(iteratee, context, 4), memo, initial); + }; + }; + + // **Reduce** builds up a single result from a list of values, aka `inject`, + // or `foldl`. + _.reduce = _.foldl = _.inject = createReduce(1); + + // The right-associative version of reduce, also known as `foldr`. + _.reduceRight = _.foldr = createReduce(-1); + + // Return the first value which passes a truth test. Aliased as `detect`. + _.find = _.detect = function(obj, predicate, context) { + var keyFinder = isArrayLike(obj) ? _.findIndex : _.findKey; + var key = keyFinder(obj, predicate, context); + if (key !== void 0 && key !== -1) return obj[key]; + }; + + // Return all the elements that pass a truth test. + // Aliased as `select`. + _.filter = _.select = function(obj, predicate, context) { + var results = []; + predicate = cb(predicate, context); + _.each(obj, function(value, index, list) { + if (predicate(value, index, list)) results.push(value); + }); + return results; + }; + + // Return all the elements for which a truth test fails. + _.reject = function(obj, predicate, context) { + return _.filter(obj, _.negate(cb(predicate)), context); + }; + + // Determine whether all of the elements match a truth test. + // Aliased as `all`. + _.every = _.all = function(obj, predicate, context) { + predicate = cb(predicate, context); + var keys = !isArrayLike(obj) && _.keys(obj), + length = (keys || obj).length; + for (var index = 0; index < length; index++) { + var currentKey = keys ? keys[index] : index; + if (!predicate(obj[currentKey], currentKey, obj)) return false; + } + return true; + }; + + // Determine if at least one element in the object matches a truth test. + // Aliased as `any`. + _.some = _.any = function(obj, predicate, context) { + predicate = cb(predicate, context); + var keys = !isArrayLike(obj) && _.keys(obj), + length = (keys || obj).length; + for (var index = 0; index < length; index++) { + var currentKey = keys ? keys[index] : index; + if (predicate(obj[currentKey], currentKey, obj)) return true; + } + return false; + }; + + // Determine if the array or object contains a given item (using `===`). + // Aliased as `includes` and `include`. + _.contains = _.includes = _.include = function(obj, item, fromIndex, guard) { + if (!isArrayLike(obj)) obj = _.values(obj); + if (typeof fromIndex != 'number' || guard) fromIndex = 0; + return _.indexOf(obj, item, fromIndex) >= 0; + }; + + // Invoke a method (with arguments) on every item in a collection. + _.invoke = restArguments(function(obj, path, args) { + var contextPath, func; + if (_.isFunction(path)) { + func = path; + } else if (_.isArray(path)) { + contextPath = path.slice(0, -1); + path = path[path.length - 1]; + } + return _.map(obj, function(context) { + var method = func; + if (!method) { + if (contextPath && contextPath.length) { + context = deepGet(context, contextPath); + } + if (context == null) return void 0; + method = context[path]; + } + return method == null ? method : method.apply(context, args); + }); + }); + + // Convenience version of a common use case of `map`: fetching a property. + _.pluck = function(obj, key) { + return _.map(obj, _.property(key)); + }; + + // Convenience version of a common use case of `filter`: selecting only objects + // containing specific `key:value` pairs. + _.where = function(obj, attrs) { + return _.filter(obj, _.matcher(attrs)); + }; + + // Convenience version of a common use case of `find`: getting the first object + // containing specific `key:value` pairs. + _.findWhere = function(obj, attrs) { + return _.find(obj, _.matcher(attrs)); + }; + + // Return the maximum element (or element-based computation). + _.max = function(obj, iteratee, context) { + var result = -Infinity, lastComputed = -Infinity, + value, computed; + if (iteratee == null || typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null) { + obj = isArrayLike(obj) ? obj : _.values(obj); + for (var i = 0, length = obj.length; i < length; i++) { + value = obj[i]; + if (value != null && value > result) { + result = value; + } + } + } else { + iteratee = cb(iteratee, context); + _.each(obj, function(v, index, list) { + computed = iteratee(v, index, list); + if (computed > lastComputed || computed === -Infinity && result === -Infinity) { + result = v; + lastComputed = computed; + } + }); + } + return result; + }; + + // Return the minimum element (or element-based computation). + _.min = function(obj, iteratee, context) { + var result = Infinity, lastComputed = Infinity, + value, computed; + if (iteratee == null || typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null) { + obj = isArrayLike(obj) ? obj : _.values(obj); + for (var i = 0, length = obj.length; i < length; i++) { + value = obj[i]; + if (value != null && value < result) { + result = value; + } + } + } else { + iteratee = cb(iteratee, context); + _.each(obj, function(v, index, list) { + computed = iteratee(v, index, list); + if (computed < lastComputed || computed === Infinity && result === Infinity) { + result = v; + lastComputed = computed; + } + }); + } + return result; + }; + + // Shuffle a collection. + _.shuffle = function(obj) { + return _.sample(obj, Infinity); + }; + + // Sample **n** random values from a collection using the modern version of the + // [Fisher-Yates shuffle](http://en.wikipedia.org/wiki/Fisher–Yates_shuffle). + // If **n** is not specified, returns a single random element. + // The internal `guard` argument allows it to work with `map`. + _.sample = function(obj, n, guard) { + if (n == null || guard) { + if (!isArrayLike(obj)) obj = _.values(obj); + return obj[_.random(obj.length - 1)]; + } + var sample = isArrayLike(obj) ? _.clone(obj) : _.values(obj); + var length = getLength(sample); + n = Math.max(Math.min(n, length), 0); + var last = length - 1; + for (var index = 0; index < n; index++) { + var rand = _.random(index, last); + var temp = sample[index]; + sample[index] = sample[rand]; + sample[rand] = temp; + } + return sample.slice(0, n); + }; + + // Sort the object's values by a criterion produced by an iteratee. + _.sortBy = function(obj, iteratee, context) { + var index = 0; + iteratee = cb(iteratee, context); + return _.pluck(_.map(obj, function(value, key, list) { + return { + value: value, + index: index++, + criteria: iteratee(value, key, list) + }; + }).sort(function(left, right) { + var a = left.criteria; + var b = right.criteria; + if (a !== b) { + if (a > b || a === void 0) return 1; + if (a < b || b === void 0) return -1; + } + return left.index - right.index; + }), 'value'); + }; + + // An internal function used for aggregate "group by" operations. + var group = function(behavior, partition) { + return function(obj, iteratee, context) { + var result = partition ? [[], []] : {}; + iteratee = cb(iteratee, context); + _.each(obj, function(value, index) { + var key = iteratee(value, index, obj); + behavior(result, value, key); + }); + return result; + }; + }; + + // Groups the object's values by a criterion. Pass either a string attribute + // to group by, or a function that returns the criterion. + _.groupBy = group(function(result, value, key) { + if (has(result, key)) result[key].push(value); else result[key] = [value]; + }); + + // Indexes the object's values by a criterion, similar to `groupBy`, but for + // when you know that your index values will be unique. + _.indexBy = group(function(result, value, key) { + result[key] = value; + }); + + // Counts instances of an object that group by a certain criterion. Pass + // either a string attribute to count by, or a function that returns the + // criterion. + _.countBy = group(function(result, value, key) { + if (has(result, key)) result[key]++; else result[key] = 1; + }); + + var reStrSymbol = /[^\ud800-\udfff]|[\ud800-\udbff][\udc00-\udfff]|[\ud800-\udfff]/g; + // Safely create a real, live array from anything iterable. + _.toArray = function(obj) { + if (!obj) return []; + if (_.isArray(obj)) return slice.call(obj); + if (_.isString(obj)) { + // Keep surrogate pair characters together + return obj.match(reStrSymbol); + } + if (isArrayLike(obj)) return _.map(obj, _.identity); + return _.values(obj); + }; + + // Return the number of elements in an object. + _.size = function(obj) { + if (obj == null) return 0; + return isArrayLike(obj) ? obj.length : _.keys(obj).length; + }; + + // Split a collection into two arrays: one whose elements all satisfy the given + // predicate, and one whose elements all do not satisfy the predicate. + _.partition = group(function(result, value, pass) { + result[pass ? 0 : 1].push(value); + }, true); + + // Array Functions + // --------------- + + // Get the first element of an array. Passing **n** will return the first N + // values in the array. Aliased as `head` and `take`. The **guard** check + // allows it to work with `_.map`. + _.first = _.head = _.take = function(array, n, guard) { + if (array == null || array.length < 1) return n == null ? void 0 : []; + if (n == null || guard) return array[0]; + return _.initial(array, array.length - n); + }; + + // Returns everything but the last entry of the array. Especially useful on + // the arguments object. Passing **n** will return all the values in + // the array, excluding the last N. + _.initial = function(array, n, guard) { + return slice.call(array, 0, Math.max(0, array.length - (n == null || guard ? 1 : n))); + }; + + // Get the last element of an array. Passing **n** will return the last N + // values in the array. + _.last = function(array, n, guard) { + if (array == null || array.length < 1) return n == null ? void 0 : []; + if (n == null || guard) return array[array.length - 1]; + return _.rest(array, Math.max(0, array.length - n)); + }; + + // Returns everything but the first entry of the array. Aliased as `tail` and `drop`. + // Especially useful on the arguments object. Passing an **n** will return + // the rest N values in the array. + _.rest = _.tail = _.drop = function(array, n, guard) { + return slice.call(array, n == null || guard ? 1 : n); + }; + + // Trim out all falsy values from an array. + _.compact = function(array) { + return _.filter(array, Boolean); + }; + + // Internal implementation of a recursive `flatten` function. + var flatten = function(input, shallow, strict, output) { + output = output || []; + var idx = output.length; + for (var i = 0, length = getLength(input); i < length; i++) { + var value = input[i]; + if (isArrayLike(value) && (_.isArray(value) || _.isArguments(value))) { + // Flatten current level of array or arguments object. + if (shallow) { + var j = 0, len = value.length; + while (j < len) output[idx++] = value[j++]; + } else { + flatten(value, shallow, strict, output); + idx = output.length; + } + } else if (!strict) { + output[idx++] = value; + } + } + return output; + }; + + // Flatten out an array, either recursively (by default), or just one level. + _.flatten = function(array, shallow) { + return flatten(array, shallow, false); + }; + + // Return a version of the array that does not contain the specified value(s). + _.without = restArguments(function(array, otherArrays) { + return _.difference(array, otherArrays); + }); + + // Produce a duplicate-free version of the array. If the array has already + // been sorted, you have the option of using a faster algorithm. + // The faster algorithm will not work with an iteratee if the iteratee + // is not a one-to-one function, so providing an iteratee will disable + // the faster algorithm. + // Aliased as `unique`. + _.uniq = _.unique = function(array, isSorted, iteratee, context) { + if (!_.isBoolean(isSorted)) { + context = iteratee; + iteratee = isSorted; + isSorted = false; + } + if (iteratee != null) iteratee = cb(iteratee, context); + var result = []; + var seen = []; + for (var i = 0, length = getLength(array); i < length; i++) { + var value = array[i], + computed = iteratee ? iteratee(value, i, array) : value; + if (isSorted && !iteratee) { + if (!i || seen !== computed) result.push(value); + seen = computed; + } else if (iteratee) { + if (!_.contains(seen, computed)) { + seen.push(computed); + result.push(value); + } + } else if (!_.contains(result, value)) { + result.push(value); + } + } + return result; + }; + + // Produce an array that contains the union: each distinct element from all of + // the passed-in arrays. + _.union = restArguments(function(arrays) { + return _.uniq(flatten(arrays, true, true)); + }); + + // Produce an array that contains every item shared between all the + // passed-in arrays. + _.intersection = function(array) { + var result = []; + var argsLength = arguments.length; + for (var i = 0, length = getLength(array); i < length; i++) { + var item = array[i]; + if (_.contains(result, item)) continue; + var j; + for (j = 1; j < argsLength; j++) { + if (!_.contains(arguments[j], item)) break; + } + if (j === argsLength) result.push(item); + } + return result; + }; + + // Take the difference between one array and a number of other arrays. + // Only the elements present in just the first array will remain. + _.difference = restArguments(function(array, rest) { + rest = flatten(rest, true, true); + return _.filter(array, function(value){ + return !_.contains(rest, value); + }); + }); + + // Complement of _.zip. Unzip accepts an array of arrays and groups + // each array's elements on shared indices. + _.unzip = function(array) { + var length = array && _.max(array, getLength).length || 0; + var result = Array(length); + + for (var index = 0; index < length; index++) { + result[index] = _.pluck(array, index); + } + return result; + }; + + // Zip together multiple lists into a single array -- elements that share + // an index go together. + _.zip = restArguments(_.unzip); + + // Converts lists into objects. Pass either a single array of `[key, value]` + // pairs, or two parallel arrays of the same length -- one of keys, and one of + // the corresponding values. Passing by pairs is the reverse of _.pairs. + _.object = function(list, values) { + var result = {}; + for (var i = 0, length = getLength(list); i < length; i++) { + if (values) { + result[list[i]] = values[i]; + } else { + result[list[i][0]] = list[i][1]; + } + } + return result; + }; + + // Generator function to create the findIndex and findLastIndex functions. + var createPredicateIndexFinder = function(dir) { + return function(array, predicate, context) { + predicate = cb(predicate, context); + var length = getLength(array); + var index = dir > 0 ? 0 : length - 1; + for (; index >= 0 && index < length; index += dir) { + if (predicate(array[index], index, array)) return index; + } + return -1; + }; + }; + + // Returns the first index on an array-like that passes a predicate test. + _.findIndex = createPredicateIndexFinder(1); + _.findLastIndex = createPredicateIndexFinder(-1); + + // Use a comparator function to figure out the smallest index at which + // an object should be inserted so as to maintain order. Uses binary search. + _.sortedIndex = function(array, obj, iteratee, context) { + iteratee = cb(iteratee, context, 1); + var value = iteratee(obj); + var low = 0, high = getLength(array); + while (low < high) { + var mid = Math.floor((low + high) / 2); + if (iteratee(array[mid]) < value) low = mid + 1; else high = mid; + } + return low; + }; + + // Generator function to create the indexOf and lastIndexOf functions. + var createIndexFinder = function(dir, predicateFind, sortedIndex) { + return function(array, item, idx) { + var i = 0, length = getLength(array); + if (typeof idx == 'number') { + if (dir > 0) { + i = idx >= 0 ? idx : Math.max(idx + length, i); + } else { + length = idx >= 0 ? Math.min(idx + 1, length) : idx + length + 1; + } + } else if (sortedIndex && idx && length) { + idx = sortedIndex(array, item); + return array[idx] === item ? idx : -1; + } + if (item !== item) { + idx = predicateFind(slice.call(array, i, length), _.isNaN); + return idx >= 0 ? idx + i : -1; + } + for (idx = dir > 0 ? i : length - 1; idx >= 0 && idx < length; idx += dir) { + if (array[idx] === item) return idx; + } + return -1; + }; + }; + + // Return the position of the first occurrence of an item in an array, + // or -1 if the item is not included in the array. + // If the array is large and already in sort order, pass `true` + // for **isSorted** to use binary search. + _.indexOf = createIndexFinder(1, _.findIndex, _.sortedIndex); + _.lastIndexOf = createIndexFinder(-1, _.findLastIndex); + + // Generate an integer Array containing an arithmetic progression. A port of + // the native Python `range()` function. See + // [the Python documentation](http://docs.python.org/library/functions.html#range). + _.range = function(start, stop, step) { + if (stop == null) { + stop = start || 0; + start = 0; + } + if (!step) { + step = stop < start ? -1 : 1; + } + + var length = Math.max(Math.ceil((stop - start) / step), 0); + var range = Array(length); + + for (var idx = 0; idx < length; idx++, start += step) { + range[idx] = start; + } + + return range; + }; + + // Chunk a single array into multiple arrays, each containing `count` or fewer + // items. + _.chunk = function(array, count) { + if (count == null || count < 1) return []; + var result = []; + var i = 0, length = array.length; + while (i < length) { + result.push(slice.call(array, i, i += count)); + } + return result; + }; + + // Function (ahem) Functions + // ------------------ + + // Determines whether to execute a function as a constructor + // or a normal function with the provided arguments. + var executeBound = function(sourceFunc, boundFunc, context, callingContext, args) { + if (!(callingContext instanceof boundFunc)) return sourceFunc.apply(context, args); + var self = baseCreate(sourceFunc.prototype); + var result = sourceFunc.apply(self, args); + if (_.isObject(result)) return result; + return self; + }; + + // Create a function bound to a given object (assigning `this`, and arguments, + // optionally). Delegates to **ECMAScript 5**'s native `Function.bind` if + // available. + _.bind = restArguments(function(func, context, args) { + if (!_.isFunction(func)) throw new TypeError('Bind must be called on a function'); + var bound = restArguments(function(callArgs) { + return executeBound(func, bound, context, this, args.concat(callArgs)); + }); + return bound; + }); + + // Partially apply a function by creating a version that has had some of its + // arguments pre-filled, without changing its dynamic `this` context. _ acts + // as a placeholder by default, allowing any combination of arguments to be + // pre-filled. Set `_.partial.placeholder` for a custom placeholder argument. + _.partial = restArguments(function(func, boundArgs) { + var placeholder = _.partial.placeholder; + var bound = function() { + var position = 0, length = boundArgs.length; + var args = Array(length); + for (var i = 0; i < length; i++) { + args[i] = boundArgs[i] === placeholder ? arguments[position++] : boundArgs[i]; + } + while (position < arguments.length) args.push(arguments[position++]); + return executeBound(func, bound, this, this, args); + }; + return bound; + }); + + _.partial.placeholder = _; + + // Bind a number of an object's methods to that object. Remaining arguments + // are the method names to be bound. Useful for ensuring that all callbacks + // defined on an object belong to it. + _.bindAll = restArguments(function(obj, keys) { + keys = flatten(keys, false, false); + var index = keys.length; + if (index < 1) throw new Error('bindAll must be passed function names'); + while (index--) { + var key = keys[index]; + obj[key] = _.bind(obj[key], obj); + } + }); + + // Memoize an expensive function by storing its results. + _.memoize = function(func, hasher) { + var memoize = function(key) { + var cache = memoize.cache; + var address = '' + (hasher ? hasher.apply(this, arguments) : key); + if (!has(cache, address)) cache[address] = func.apply(this, arguments); + return cache[address]; + }; + memoize.cache = {}; + return memoize; + }; + + // Delays a function for the given number of milliseconds, and then calls + // it with the arguments supplied. + _.delay = restArguments(function(func, wait, args) { + return setTimeout(function() { + return func.apply(null, args); + }, wait); + }); + + // Defers a function, scheduling it to run after the current call stack has + // cleared. + _.defer = _.partial(_.delay, _, 1); + + // Returns a function, that, when invoked, will only be triggered at most once + // during a given window of time. Normally, the throttled function will run + // as much as it can, without ever going more than once per `wait` duration; + // but if you'd like to disable the execution on the leading edge, pass + // `{leading: false}`. To disable execution on the trailing edge, ditto. + _.throttle = function(func, wait, options) { + var timeout, context, args, result; + var previous = 0; + if (!options) options = {}; + + var later = function() { + previous = options.leading === false ? 0 : _.now(); + timeout = null; + result = func.apply(context, args); + if (!timeout) context = args = null; + }; + + var throttled = function() { + var now = _.now(); + if (!previous && options.leading === false) previous = now; + var remaining = wait - (now - previous); + context = this; + args = arguments; + if (remaining <= 0 || remaining > wait) { + if (timeout) { + clearTimeout(timeout); + timeout = null; + } + previous = now; + result = func.apply(context, args); + if (!timeout) context = args = null; + } else if (!timeout && options.trailing !== false) { + timeout = setTimeout(later, remaining); + } + return result; + }; + + throttled.cancel = function() { + clearTimeout(timeout); + previous = 0; + timeout = context = args = null; + }; + + return throttled; + }; + + // Returns a function, that, as long as it continues to be invoked, will not + // be triggered. The function will be called after it stops being called for + // N milliseconds. If `immediate` is passed, trigger the function on the + // leading edge, instead of the trailing. + _.debounce = function(func, wait, immediate) { + var timeout, result; + + var later = function(context, args) { + timeout = null; + if (args) result = func.apply(context, args); + }; + + var debounced = restArguments(function(args) { + if (timeout) clearTimeout(timeout); + if (immediate) { + var callNow = !timeout; + timeout = setTimeout(later, wait); + if (callNow) result = func.apply(this, args); + } else { + timeout = _.delay(later, wait, this, args); + } + + return result; + }); + + debounced.cancel = function() { + clearTimeout(timeout); + timeout = null; + }; + + return debounced; + }; + + // Returns the first function passed as an argument to the second, + // allowing you to adjust arguments, run code before and after, and + // conditionally execute the original function. + _.wrap = function(func, wrapper) { + return _.partial(wrapper, func); + }; + + // Returns a negated version of the passed-in predicate. + _.negate = function(predicate) { + return function() { + return !predicate.apply(this, arguments); + }; + }; + + // Returns a function that is the composition of a list of functions, each + // consuming the return value of the function that follows. + _.compose = function() { + var args = arguments; + var start = args.length - 1; + return function() { + var i = start; + var result = args[start].apply(this, arguments); + while (i--) result = args[i].call(this, result); + return result; + }; + }; + + // Returns a function that will only be executed on and after the Nth call. + _.after = function(times, func) { + return function() { + if (--times < 1) { + return func.apply(this, arguments); + } + }; + }; + + // Returns a function that will only be executed up to (but not including) the Nth call. + _.before = function(times, func) { + var memo; + return function() { + if (--times > 0) { + memo = func.apply(this, arguments); + } + if (times <= 1) func = null; + return memo; + }; + }; + + // Returns a function that will be executed at most one time, no matter how + // often you call it. Useful for lazy initialization. + _.once = _.partial(_.before, 2); + + _.restArguments = restArguments; + + // Object Functions + // ---------------- + + // Keys in IE < 9 that won't be iterated by `for key in ...` and thus missed. + var hasEnumBug = !{toString: null}.propertyIsEnumerable('toString'); + var nonEnumerableProps = ['valueOf', 'isPrototypeOf', 'toString', + 'propertyIsEnumerable', 'hasOwnProperty', 'toLocaleString']; + + var collectNonEnumProps = function(obj, keys) { + var nonEnumIdx = nonEnumerableProps.length; + var constructor = obj.constructor; + var proto = _.isFunction(constructor) && constructor.prototype || ObjProto; + + // Constructor is a special case. + var prop = 'constructor'; + if (has(obj, prop) && !_.contains(keys, prop)) keys.push(prop); + + while (nonEnumIdx--) { + prop = nonEnumerableProps[nonEnumIdx]; + if (prop in obj && obj[prop] !== proto[prop] && !_.contains(keys, prop)) { + keys.push(prop); + } + } + }; + + // Retrieve the names of an object's own properties. + // Delegates to **ECMAScript 5**'s native `Object.keys`. + _.keys = function(obj) { + if (!_.isObject(obj)) return []; + if (nativeKeys) return nativeKeys(obj); + var keys = []; + for (var key in obj) if (has(obj, key)) keys.push(key); + // Ahem, IE < 9. + if (hasEnumBug) collectNonEnumProps(obj, keys); + return keys; + }; + + // Retrieve all the property names of an object. + _.allKeys = function(obj) { + if (!_.isObject(obj)) return []; + var keys = []; + for (var key in obj) keys.push(key); + // Ahem, IE < 9. + if (hasEnumBug) collectNonEnumProps(obj, keys); + return keys; + }; + + // Retrieve the values of an object's properties. + _.values = function(obj) { + var keys = _.keys(obj); + var length = keys.length; + var values = Array(length); + for (var i = 0; i < length; i++) { + values[i] = obj[keys[i]]; + } + return values; + }; + + // Returns the results of applying the iteratee to each element of the object. + // In contrast to _.map it returns an object. + _.mapObject = function(obj, iteratee, context) { + iteratee = cb(iteratee, context); + var keys = _.keys(obj), + length = keys.length, + results = {}; + for (var index = 0; index < length; index++) { + var currentKey = keys[index]; + results[currentKey] = iteratee(obj[currentKey], currentKey, obj); + } + return results; + }; + + // Convert an object into a list of `[key, value]` pairs. + // The opposite of _.object. + _.pairs = function(obj) { + var keys = _.keys(obj); + var length = keys.length; + var pairs = Array(length); + for (var i = 0; i < length; i++) { + pairs[i] = [keys[i], obj[keys[i]]]; + } + return pairs; + }; + + // Invert the keys and values of an object. The values must be serializable. + _.invert = function(obj) { + var result = {}; + var keys = _.keys(obj); + for (var i = 0, length = keys.length; i < length; i++) { + result[obj[keys[i]]] = keys[i]; + } + return result; + }; + + // Return a sorted list of the function names available on the object. + // Aliased as `methods`. + _.functions = _.methods = function(obj) { + var names = []; + for (var key in obj) { + if (_.isFunction(obj[key])) names.push(key); + } + return names.sort(); + }; + + // An internal function for creating assigner functions. + var createAssigner = function(keysFunc, defaults) { + return function(obj) { + var length = arguments.length; + if (defaults) obj = Object(obj); + if (length < 2 || obj == null) return obj; + for (var index = 1; index < length; index++) { + var source = arguments[index], + keys = keysFunc(source), + l = keys.length; + for (var i = 0; i < l; i++) { + var key = keys[i]; + if (!defaults || obj[key] === void 0) obj[key] = source[key]; + } + } + return obj; + }; + }; + + // Extend a given object with all the properties in passed-in object(s). + _.extend = createAssigner(_.allKeys); + + // Assigns a given object with all the own properties in the passed-in object(s). + // (https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/assign) + _.extendOwn = _.assign = createAssigner(_.keys); + + // Returns the first key on an object that passes a predicate test. + _.findKey = function(obj, predicate, context) { + predicate = cb(predicate, context); + var keys = _.keys(obj), key; + for (var i = 0, length = keys.length; i < length; i++) { + key = keys[i]; + if (predicate(obj[key], key, obj)) return key; + } + }; + + // Internal pick helper function to determine if `obj` has key `key`. + var keyInObj = function(value, key, obj) { + return key in obj; + }; + + // Return a copy of the object only containing the whitelisted properties. + _.pick = restArguments(function(obj, keys) { + var result = {}, iteratee = keys[0]; + if (obj == null) return result; + if (_.isFunction(iteratee)) { + if (keys.length > 1) iteratee = optimizeCb(iteratee, keys[1]); + keys = _.allKeys(obj); + } else { + iteratee = keyInObj; + keys = flatten(keys, false, false); + obj = Object(obj); + } + for (var i = 0, length = keys.length; i < length; i++) { + var key = keys[i]; + var value = obj[key]; + if (iteratee(value, key, obj)) result[key] = value; + } + return result; + }); + + // Return a copy of the object without the blacklisted properties. + _.omit = restArguments(function(obj, keys) { + var iteratee = keys[0], context; + if (_.isFunction(iteratee)) { + iteratee = _.negate(iteratee); + if (keys.length > 1) context = keys[1]; + } else { + keys = _.map(flatten(keys, false, false), String); + iteratee = function(value, key) { + return !_.contains(keys, key); + }; + } + return _.pick(obj, iteratee, context); + }); + + // Fill in a given object with default properties. + _.defaults = createAssigner(_.allKeys, true); + + // Creates an object that inherits from the given prototype object. + // If additional properties are provided then they will be added to the + // created object. + _.create = function(prototype, props) { + var result = baseCreate(prototype); + if (props) _.extendOwn(result, props); + return result; + }; + + // Create a (shallow-cloned) duplicate of an object. + _.clone = function(obj) { + if (!_.isObject(obj)) return obj; + return _.isArray(obj) ? obj.slice() : _.extend({}, obj); + }; + + // Invokes interceptor with the obj, and then returns obj. + // The primary purpose of this method is to "tap into" a method chain, in + // order to perform operations on intermediate results within the chain. + _.tap = function(obj, interceptor) { + interceptor(obj); + return obj; + }; + + // Returns whether an object has a given set of `key:value` pairs. + _.isMatch = function(object, attrs) { + var keys = _.keys(attrs), length = keys.length; + if (object == null) return !length; + var obj = Object(object); + for (var i = 0; i < length; i++) { + var key = keys[i]; + if (attrs[key] !== obj[key] || !(key in obj)) return false; + } + return true; + }; + + + // Internal recursive comparison function for `isEqual`. + var eq, deepEq; + eq = function(a, b, aStack, bStack) { + // Identical objects are equal. `0 === -0`, but they aren't identical. + // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal). + if (a === b) return a !== 0 || 1 / a === 1 / b; + // `null` or `undefined` only equal to itself (strict comparison). + if (a == null || b == null) return false; + // `NaN`s are equivalent, but non-reflexive. + if (a !== a) return b !== b; + // Exhaust primitive checks + var type = typeof a; + if (type !== 'function' && type !== 'object' && typeof b != 'object') return false; + return deepEq(a, b, aStack, bStack); + }; + + // Internal recursive comparison function for `isEqual`. + deepEq = function(a, b, aStack, bStack) { + // Unwrap any wrapped objects. + if (a instanceof _) a = a._wrapped; + if (b instanceof _) b = b._wrapped; + // Compare `[[Class]]` names. + var className = toString.call(a); + if (className !== toString.call(b)) return false; + switch (className) { + // Strings, numbers, regular expressions, dates, and booleans are compared by value. + case '[object RegExp]': + // RegExps are coerced to strings for comparison (Note: '' + /a/i === '/a/i') + case '[object String]': + // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is + // equivalent to `new String("5")`. + return '' + a === '' + b; + case '[object Number]': + // `NaN`s are equivalent, but non-reflexive. + // Object(NaN) is equivalent to NaN. + if (+a !== +a) return +b !== +b; + // An `egal` comparison is performed for other numeric values. + return +a === 0 ? 1 / +a === 1 / b : +a === +b; + case '[object Date]': + case '[object Boolean]': + // Coerce dates and booleans to numeric primitive values. Dates are compared by their + // millisecond representations. Note that invalid dates with millisecond representations + // of `NaN` are not equivalent. + return +a === +b; + case '[object Symbol]': + return SymbolProto.valueOf.call(a) === SymbolProto.valueOf.call(b); + } + + var areArrays = className === '[object Array]'; + if (!areArrays) { + if (typeof a != 'object' || typeof b != 'object') return false; + + // Objects with different constructors are not equivalent, but `Object`s or `Array`s + // from different frames are. + var aCtor = a.constructor, bCtor = b.constructor; + if (aCtor !== bCtor && !(_.isFunction(aCtor) && aCtor instanceof aCtor && + _.isFunction(bCtor) && bCtor instanceof bCtor) + && ('constructor' in a && 'constructor' in b)) { + return false; + } + } + // Assume equality for cyclic structures. The algorithm for detecting cyclic + // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`. + + // Initializing stack of traversed objects. + // It's done here since we only need them for objects and arrays comparison. + aStack = aStack || []; + bStack = bStack || []; + var length = aStack.length; + while (length--) { + // Linear search. Performance is inversely proportional to the number of + // unique nested structures. + if (aStack[length] === a) return bStack[length] === b; + } + + // Add the first object to the stack of traversed objects. + aStack.push(a); + bStack.push(b); + + // Recursively compare objects and arrays. + if (areArrays) { + // Compare array lengths to determine if a deep comparison is necessary. + length = a.length; + if (length !== b.length) return false; + // Deep compare the contents, ignoring non-numeric properties. + while (length--) { + if (!eq(a[length], b[length], aStack, bStack)) return false; + } + } else { + // Deep compare objects. + var keys = _.keys(a), key; + length = keys.length; + // Ensure that both objects contain the same number of properties before comparing deep equality. + if (_.keys(b).length !== length) return false; + while (length--) { + // Deep compare each member + key = keys[length]; + if (!(has(b, key) && eq(a[key], b[key], aStack, bStack))) return false; + } + } + // Remove the first object from the stack of traversed objects. + aStack.pop(); + bStack.pop(); + return true; + }; + + // Perform a deep comparison to check if two objects are equal. + _.isEqual = function(a, b) { + return eq(a, b); + }; + + // Is a given array, string, or object empty? + // An "empty" object has no enumerable own-properties. + _.isEmpty = function(obj) { + if (obj == null) return true; + if (isArrayLike(obj) && (_.isArray(obj) || _.isString(obj) || _.isArguments(obj))) return obj.length === 0; + return _.keys(obj).length === 0; + }; + + // Is a given value a DOM element? + _.isElement = function(obj) { + return !!(obj && obj.nodeType === 1); + }; + + // Is a given value an array? + // Delegates to ECMA5's native Array.isArray + _.isArray = nativeIsArray || function(obj) { + return toString.call(obj) === '[object Array]'; + }; + + // Is a given variable an object? + _.isObject = function(obj) { + var type = typeof obj; + return type === 'function' || type === 'object' && !!obj; + }; + + // Add some isType methods: isArguments, isFunction, isString, isNumber, isDate, isRegExp, isError, isMap, isWeakMap, isSet, isWeakSet. + _.each(['Arguments', 'Function', 'String', 'Number', 'Date', 'RegExp', 'Error', 'Symbol', 'Map', 'WeakMap', 'Set', 'WeakSet'], function(name) { + _['is' + name] = function(obj) { + return toString.call(obj) === '[object ' + name + ']'; + }; + }); + + // Define a fallback version of the method in browsers (ahem, IE < 9), where + // there isn't any inspectable "Arguments" type. + if (!_.isArguments(arguments)) { + _.isArguments = function(obj) { + return has(obj, 'callee'); + }; + } + + // Optimize `isFunction` if appropriate. Work around some typeof bugs in old v8, + // IE 11 (#1621), Safari 8 (#1929), and PhantomJS (#2236). + var nodelist = root.document && root.document.childNodes; + if (typeof /./ != 'function' && typeof Int8Array != 'object' && typeof nodelist != 'function') { + _.isFunction = function(obj) { + return typeof obj == 'function' || false; + }; + } + + // Is a given object a finite number? + _.isFinite = function(obj) { + return !_.isSymbol(obj) && isFinite(obj) && !isNaN(parseFloat(obj)); + }; + + // Is the given value `NaN`? + _.isNaN = function(obj) { + return _.isNumber(obj) && isNaN(obj); + }; + + // Is a given value a boolean? + _.isBoolean = function(obj) { + return obj === true || obj === false || toString.call(obj) === '[object Boolean]'; + }; + + // Is a given value equal to null? + _.isNull = function(obj) { + return obj === null; + }; + + // Is a given variable undefined? + _.isUndefined = function(obj) { + return obj === void 0; + }; + + // Shortcut function for checking if an object has a given property directly + // on itself (in other words, not on a prototype). + _.has = function(obj, path) { + if (!_.isArray(path)) { + return has(obj, path); + } + var length = path.length; + for (var i = 0; i < length; i++) { + var key = path[i]; + if (obj == null || !hasOwnProperty.call(obj, key)) { + return false; + } + obj = obj[key]; + } + return !!length; + }; + + // Utility Functions + // ----------------- + + // Run Underscore.js in *noConflict* mode, returning the `_` variable to its + // previous owner. Returns a reference to the Underscore object. + _.noConflict = function() { + root._ = previousUnderscore; + return this; + }; + + // Keep the identity function around for default iteratees. + _.identity = function(value) { + return value; + }; + + // Predicate-generating functions. Often useful outside of Underscore. + _.constant = function(value) { + return function() { + return value; + }; + }; + + _.noop = function(){}; + + // Creates a function that, when passed an object, will traverse that object’s + // properties down the given `path`, specified as an array of keys or indexes. + _.property = function(path) { + if (!_.isArray(path)) { + return shallowProperty(path); + } + return function(obj) { + return deepGet(obj, path); + }; + }; + + // Generates a function for a given object that returns a given property. + _.propertyOf = function(obj) { + if (obj == null) { + return function(){}; + } + return function(path) { + return !_.isArray(path) ? obj[path] : deepGet(obj, path); + }; + }; + + // Returns a predicate for checking whether an object has a given set of + // `key:value` pairs. + _.matcher = _.matches = function(attrs) { + attrs = _.extendOwn({}, attrs); + return function(obj) { + return _.isMatch(obj, attrs); + }; + }; + + // Run a function **n** times. + _.times = function(n, iteratee, context) { + var accum = Array(Math.max(0, n)); + iteratee = optimizeCb(iteratee, context, 1); + for (var i = 0; i < n; i++) accum[i] = iteratee(i); + return accum; + }; + + // Return a random integer between min and max (inclusive). + _.random = function(min, max) { + if (max == null) { + max = min; + min = 0; + } + return min + Math.floor(Math.random() * (max - min + 1)); + }; + + // A (possibly faster) way to get the current timestamp as an integer. + _.now = Date.now || function() { + return new Date().getTime(); + }; + + // List of HTML entities for escaping. + var escapeMap = { + '&': '&', + '<': '<', + '>': '>', + '"': '"', + "'": ''', + '`': '`' + }; + var unescapeMap = _.invert(escapeMap); + + // Functions for escaping and unescaping strings to/from HTML interpolation. + var createEscaper = function(map) { + var escaper = function(match) { + return map[match]; + }; + // Regexes for identifying a key that needs to be escaped. + var source = '(?:' + _.keys(map).join('|') + ')'; + var testRegexp = RegExp(source); + var replaceRegexp = RegExp(source, 'g'); + return function(string) { + string = string == null ? '' : '' + string; + return testRegexp.test(string) ? string.replace(replaceRegexp, escaper) : string; + }; + }; + _.escape = createEscaper(escapeMap); + _.unescape = createEscaper(unescapeMap); + + // Traverses the children of `obj` along `path`. If a child is a function, it + // is invoked with its parent as context. Returns the value of the final + // child, or `fallback` if any child is undefined. + _.result = function(obj, path, fallback) { + if (!_.isArray(path)) path = [path]; + var length = path.length; + if (!length) { + return _.isFunction(fallback) ? fallback.call(obj) : fallback; + } + for (var i = 0; i < length; i++) { + var prop = obj == null ? void 0 : obj[path[i]]; + if (prop === void 0) { + prop = fallback; + i = length; // Ensure we don't continue iterating. + } + obj = _.isFunction(prop) ? prop.call(obj) : prop; + } + return obj; + }; + + // Generate a unique integer id (unique within the entire client session). + // Useful for temporary DOM ids. + var idCounter = 0; + _.uniqueId = function(prefix) { + var id = ++idCounter + ''; + return prefix ? prefix + id : id; + }; + + // By default, Underscore uses ERB-style template delimiters, change the + // following template settings to use alternative delimiters. + _.templateSettings = { + evaluate: /<%([\s\S]+?)%>/g, + interpolate: /<%=([\s\S]+?)%>/g, + escape: /<%-([\s\S]+?)%>/g + }; + + // When customizing `templateSettings`, if you don't want to define an + // interpolation, evaluation or escaping regex, we need one that is + // guaranteed not to match. + var noMatch = /(.)^/; + + // Certain characters need to be escaped so that they can be put into a + // string literal. + var escapes = { + "'": "'", + '\\': '\\', + '\r': 'r', + '\n': 'n', + '\u2028': 'u2028', + '\u2029': 'u2029' + }; + + var escapeRegExp = /\\|'|\r|\n|\u2028|\u2029/g; + + var escapeChar = function(match) { + return '\\' + escapes[match]; + }; + + // JavaScript micro-templating, similar to John Resig's implementation. + // Underscore templating handles arbitrary delimiters, preserves whitespace, + // and correctly escapes quotes within interpolated code. + // NB: `oldSettings` only exists for backwards compatibility. + _.template = function(text, settings, oldSettings) { + if (!settings && oldSettings) settings = oldSettings; + settings = _.defaults({}, settings, _.templateSettings); + + // Combine delimiters into one regular expression via alternation. + var matcher = RegExp([ + (settings.escape || noMatch).source, + (settings.interpolate || noMatch).source, + (settings.evaluate || noMatch).source + ].join('|') + '|$', 'g'); + + // Compile the template source, escaping string literals appropriately. + var index = 0; + var source = "__p+='"; + text.replace(matcher, function(match, escape, interpolate, evaluate, offset) { + source += text.slice(index, offset).replace(escapeRegExp, escapeChar); + index = offset + match.length; + + if (escape) { + source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'"; + } else if (interpolate) { + source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'"; + } else if (evaluate) { + source += "';\n" + evaluate + "\n__p+='"; + } + + // Adobe VMs need the match returned to produce the correct offset. + return match; + }); + source += "';\n"; + + // If a variable is not specified, place data values in local scope. + if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n'; + + source = "var __t,__p='',__j=Array.prototype.join," + + "print=function(){__p+=__j.call(arguments,'');};\n" + + source + 'return __p;\n'; + + var render; + try { + render = new Function(settings.variable || 'obj', '_', source); + } catch (e) { + e.source = source; + throw e; + } + + var template = function(data) { + return render.call(this, data, _); + }; + + // Provide the compiled source as a convenience for precompilation. + var argument = settings.variable || 'obj'; + template.source = 'function(' + argument + '){\n' + source + '}'; + + return template; + }; + + // Add a "chain" function. Start chaining a wrapped Underscore object. + _.chain = function(obj) { + var instance = _(obj); + instance._chain = true; + return instance; + }; + + // OOP + // --------------- + // If Underscore is called as a function, it returns a wrapped object that + // can be used OO-style. This wrapper holds altered versions of all the + // underscore functions. Wrapped objects may be chained. + + // Helper function to continue chaining intermediate results. + var chainResult = function(instance, obj) { + return instance._chain ? _(obj).chain() : obj; + }; + + // Add your own custom functions to the Underscore object. + _.mixin = function(obj) { + _.each(_.functions(obj), function(name) { + var func = _[name] = obj[name]; + _.prototype[name] = function() { + var args = [this._wrapped]; + push.apply(args, arguments); + return chainResult(this, func.apply(_, args)); + }; + }); + return _; + }; + + // Add all of the Underscore functions to the wrapper object. + _.mixin(_); + + // Add all mutator Array functions to the wrapper. + _.each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) { + var method = ArrayProto[name]; + _.prototype[name] = function() { + var obj = this._wrapped; + method.apply(obj, arguments); + if ((name === 'shift' || name === 'splice') && obj.length === 0) delete obj[0]; + return chainResult(this, obj); + }; + }); + + // Add all accessor Array functions to the wrapper. + _.each(['concat', 'join', 'slice'], function(name) { + var method = ArrayProto[name]; + _.prototype[name] = function() { + return chainResult(this, method.apply(this._wrapped, arguments)); + }; + }); + + // Extracts the result from a wrapped and chained object. + _.prototype.value = function() { + return this._wrapped; + }; + + // Provide unwrapping proxy for some methods used in engine operations + // such as arithmetic and JSON stringification. + _.prototype.valueOf = _.prototype.toJSON = _.prototype.value; + + _.prototype.toString = function() { + return String(this._wrapped); + }; + + // AMD registration happens at the end for compatibility with AMD loaders + // that may not enforce next-turn semantics on modules. Even though general + // practice for AMD registration is to be anonymous, underscore registers + // as a named module because, like jQuery, it is a base library that is + // popular enough to be bundled in a third party lib, but not be part of + // an AMD load request. Those cases could generate an error when an + // anonymous define() is called outside of a loader request. + if (typeof define == 'function' && define.amd) { + define('underscore', [], function() { + return _; + }); + } +}()); \ No newline at end of file diff --git a/controllers/track.js b/controllers/track.js index fa8126d..f88c625 100644 --- a/controllers/track.js +++ b/controllers/track.js @@ -10,7 +10,10 @@ $scope.num_discs = 0; $scope.tracks = []; $scope.similarTracks = [] - + $scope.showAll = false + $scope.toggleShowAll = function () { + $scope.showAll = !$scope.showAll + } API.getTrack($scope.identifier).then(function(track) { console.log('got track', track); $scope.type = track.album_type @@ -27,7 +30,7 @@ $scope.data.images = track.album.images $scope.data.authors = track.album.authors $scope.data.authorIds = track.artists.map(o => o.id).join(',') - + API.getAudioAnalysisForTrack($scope.identifier).then(function (features) { $scope.data.features = features }) @@ -53,6 +56,10 @@ i++ } }); + API.getAlbumTracks($scope.data.album.id).then(function (tracks) { + $scope.data.album.tracks = tracks.items + + }) }); $scope.currenttrack = PlayQueue.getCurrent(); diff --git a/filters/timeago.js b/filters/timeago.js index 024acc5..5bc2e05 100644 --- a/filters/timeago.js +++ b/filters/timeago.js @@ -8,6 +8,14 @@ return '-'; } + function twodigit(n) { + if (n < 10) { + return '0' + n; + } else { + return n; + } + } + var substitute = function (string, number) { return string.replace(/%d/i, number); }, @@ -39,7 +47,7 @@ suffix = strings.suffixAgo; if (days > 15) { var time = new Date(input) - return time.getFullYear() + '-' + time.getMonth() + '-' + time.getDate() + return time.getFullYear() + '-' + twodigit(time.getMonth()) + '-' + twodigit(time.getDate()) } words = seconds < 45 && substitute(strings.seconds, Math.round(seconds), strings) || seconds < 90 && substitute(strings.minute, 1, strings) || diff --git a/index.html b/index.html index 188b0f5..c32ac14 100644 --- a/index.html +++ b/index.html @@ -10,6 +10,9 @@ + + + diff --git a/partials/album.html b/partials/album.html index fc1de93..b1ba297 100644 --- a/partials/album.html +++ b/partials/album.html @@ -21,11 +21,11 @@ - + {{t.name}} - {{t.duration_ms | displaytime}} - + {{t.duration_ms | displaytime}} +
      diff --git a/partials/playlist.html b/partials/playlist.html index f65c06e..e9e143f 100644 --- a/partials/playlist.html +++ b/partials/playlist.html @@ -7,34 +7,35 @@ TRACK ARTIST - TIME ALBUM ADDED + TIME USER - - + + - - {{t.track.name}} + + {{t.track.name}} - + {{t.track.artists[0].name}} - - {{ t.track.duration_ms | displaytime }} - - + + {{t.track.album.name}} - + {{t.added_at | timeago}} - + {{t.added_by.id}} + + {{ t.track.duration_ms | displaytime }} + diff --git a/partials/track.html b/partials/track.html index 3f3a1a8..6b38cd7 100644 --- a/partials/track.html +++ b/partials/track.html @@ -1,25 +1,23 @@ - +
      - - - + - - +
      # TRACK TIME POPULARITY
      {{t.track_number}}
      + {{t.name}} {{t.duration_ms | displaytime}}{{t.duration_ms | displaytime}}
      @@ -29,17 +27,20 @@
      - Show album + Show all tracks + Show only current track
      -
      + - +
      -

      Recommended tracks

      - +
      + Recommended tracks + +
      diff --git a/services/api.js b/services/api.js index 815bcae..7bbb2c3 100644 --- a/services/api.js +++ b/services/api.js @@ -192,14 +192,16 @@ return ret.promise; }, - getPlaylist: function(username, playlist) { + getPlaylist: function(username, identifier) { var ret = $q.defer(); - $http.get(baseUrl + '/users/' + encodeURIComponent(username) + '/playlists/' + encodeURIComponent(playlist), { + $http.get(baseUrl + '/users/' + encodeURIComponent(username) + '/playlists/' + encodeURIComponent(identifier), { headers: { 'Authorization': 'Bearer ' + Auth.getAccessToken() } }).success(function(r) { console.log('got playlists', r); + localStorage.setItem('spotify:playlist:' + identifier + ':snapshot:' + r.snapshot_id, JSON.stringify(r)) + localStorage.setItem('spotify:playlist:' + identifier, JSON.stringify(r)) ret.resolve(r); }); return ret.promise; @@ -218,14 +220,33 @@ return ret.promise; }, - getPlaylistTracks: function(username, playlist) { + getPlaylistTracks: function(username, identifier, snapshot_id) { var ret = $q.defer(); - $http.get(baseUrl + '/users/' + encodeURIComponent(username) + '/playlists/' + encodeURIComponent(playlist) + '/tracks', { + $http.get(baseUrl + '/users/' + encodeURIComponent(username) + '/playlists/' + encodeURIComponent(identifier) + '/tracks', { headers: { 'Authorization': 'Bearer ' + Auth.getAccessToken() } }).success(function(r) { console.log('got playlist tracks', r); + +/* + var diff = arrayDiff({compress: true}) + + var old_revision = JSON.parse(localStorage.getItem('spotify:playlist:' + identifier + ':track')) + + var oldTracks = [] + + if (old_revision) { + oldTracks = JSON.parse(old_revision).tracks.items + } + + let difference = diff(oldTracks, r.tracks.items) + + localStorage.setItem('spotify:playlist:' + identifier ':snapshot:' + snapshot_id + ':track', JSON.stringify(r)) + + localStorage.setItem('spotify:playlist:' + identifier ':track', JSON.stringify(r))*/ + + ret.resolve(r); }); return ret.promise; @@ -245,7 +266,7 @@ return ret.promise; }, - getTracksInPlaylistById: function(identifier) { + getTracksInPlaylistById: function(identifier, snapshot_id) { var ret = $q.defer(); $http.get(baseUrl + '/playlists/' + encodeURIComponent(identifier) + '/tracks', { headers: { diff --git a/style.css b/style.css index 0bbb2fa..7fc681d 100644 --- a/style.css +++ b/style.css @@ -1,6 +1,7 @@ :root { --background-color: #121314; - --color: #fefefe; + --color: #afafaf; + --strong-color: #fff; --primary-color: #1db954; --vibrant-color: rgba(255,255,255,0.15); } @@ -54,7 +55,9 @@ h2 { padding: 0; margin: 0 0 10px 0; } - +.sidekick { + opacity: 0.9; +} h3, summary { font-family: 'Open Sans', sans-serif; font-weight: 300; @@ -71,10 +74,23 @@ h4 { margin: 0 0 0 0; } +h1,h2,h3,h4, a { + color: var(--strong-color) !important; +} +a { + color: white; +} p { margin: 0 0 10px 0; } +a:hover { + text-decoration: underline; +} +a:active { + opacity: 0.8; +} + a { color: inherit; cursor: pointer; @@ -330,7 +346,7 @@ generic-header { bottom: 0px; padding: 0px; overflow: auto; - color: #88898c; + color: var(--color); /* Permalink - use to edit and share this gradient: http://colorzilla.com/gradient-editor/#ffffff+0,ffffff+100&0.25+0,0+100 */ } @@ -409,6 +425,7 @@ a.button { border-radius: 50px; font-size: 12pt; margin-right: 12pt; + border: 1px solid var(--color); } From 19a01cab1da6209dd997f8bb8ab3d2e8cb9ab3cd Mon Sep 17 00:00:00 2001 From: Alexander Forselius Date: Tue, 11 Sep 2018 00:01:33 +0200 Subject: [PATCH 09/12] Working on thirtify --- app.js | 22 +++++- controllers/app.js | 7 +- controllers/episode.js | 100 ++++++++++++++++++++++++ controllers/hashtag.js | 54 +++++++++++++ controllers/player.js | 3 + controllers/playlist.js | 5 +- controllers/show.js | 16 ++-- directives/app.js | 56 ++++++++++++++ directives/notation.js | 45 +++++++++++ index.html | 5 +- partials/app.html | 2 +- partials/episode.html | 70 +++++++++++++++++ partials/generic_header.html | 4 +- partials/hashtag.html | 142 +++++++++++++++++++++++++++++++++++ partials/show.html | 6 +- services/api.js | 44 +++++++++++ 16 files changed, 563 insertions(+), 18 deletions(-) create mode 100644 controllers/hashtag.js create mode 100644 directives/app.js create mode 100644 directives/notation.js create mode 100644 partials/episode.html create mode 100644 partials/hashtag.html diff --git a/app.js b/app.js index a1cb736..5766d84 100644 --- a/app.js +++ b/app.js @@ -53,11 +53,19 @@ templateUrl: 'partials/searchresults.html', controller: 'SearchResultsController' }). - when('/app/:identifier', { + when('/apps?/:bundle', { templateUrl: 'partials/app.html', controller: 'HTMLAppController' }). + when('/apps?/:bundle/:resource', { + templateUrl: 'partials/app.html', + controller: 'HTMLAppController' + }). + when('/apps?/:bundle/:resource/:identifier', { + templateUrl: 'partials/app.html', + controller: 'HTMLAppController' + }). when('/category/:categoryid', { templateUrl: 'partials/browsecategory.html', controller: 'BrowseCategoryController' @@ -86,6 +94,14 @@ templateUrl: 'partials/country.html', controller: 'CountryController' }). + when('/episodes?/:identifier', { + templateUrl: 'partials/episode.html', + controller: 'EpisodeController' + }). + when('/hashtags?/:hashtag', { + templateUrl: 'partials/hashtag.html', + controller: 'HashtagController' + }). otherwise({ redirectTo: '/' }); @@ -110,6 +126,8 @@ }); } + + window.addEventListener("message", function(event) { console.log('got postmessage', event); var hash = JSON.parse(event.data); @@ -142,6 +160,8 @@ } }; + + $scope.focusInput = false; $scope.menuOptions = function(playlist) { diff --git a/controllers/app.js b/controllers/app.js index d770191..101cbaa 100644 --- a/controllers/app.js +++ b/controllers/app.js @@ -3,9 +3,10 @@ var module = angular.module('PlayerApp'); module.controller('HTMLAppController', function($scope, $rootScope, API, PlayQueue, $routeParams) { - $scope.src = 'http://' + $routeParams.identifier + '.buddhalow.net' - $scope.width = '100%' - $scope.height = '100%' + $scope.bundle = $routeParams.bundle + $scope.resource = $routeParams.resource + $scope.identifier = $routeParams.identifier + console.log("Route parameters", $routeParams) }); diff --git a/controllers/episode.js b/controllers/episode.js index e69de29..8305da7 100644 --- a/controllers/episode.js +++ b/controllers/episode.js @@ -0,0 +1,100 @@ +(function() { + + var module = angular.module('PlayerApp'); + + module.controller('EpisodeController', function($scope, $rootScope, API, PlayQueue, $routeParams) { + $scope.identifier = $routeParams.identifier; + $scope.data = null; + $scope.release_year = ''; + $scope.total_duration = 0; + $scope.num_discs = 0; + $scope.tracks = []; + $scope.similarTracks = [] + $scope.showAll = false + $scope.toggleShowAll = function () { + $scope.showAll = !$scope.showAll + } + API.getEpisodeById($scope.identifier).then(function(track) { + console.log('got track', track); + $scope.type = 'episode' + + $scope.release_year = ''; + + $scope.data = track + $scope.data.images = track.show.images + $scope.data.authors = [{ + name: track.show.publisher, + id: track.show.publisher, + type: 'publisher' + }] + $scope.data.show.authors = [{ + name: track.show.publisher, + id: track.show.publisher, + type: 'publisher' + }] + $scope.tracks.push($scope.data) + let img = document.createElement('img') + img.crossOrigin = "Anonymous"; + img.src = $scope.data.images && $scope.data.images.length > 0 ? $scope.data.images[0].url : '' + + img.addEventListener('load', function() { + var vibrant = new Vibrant(img); + + var swatches = vibrant.swatches() + let i = 0; + for (var swatch in swatches) { + if (i == 1) { + if (swatches.hasOwnProperty(swatch) && swatches[swatch]) { + let hex = swatches[swatch].getHex() + console.log(swatch, hex) + document.documentElement.style.setProperty('--vibrant-color', hex + '55') + break; + } + } + i++ + } + }); + API.getEpisodesInShow($scope.data.show.id).then(function (episodes) { + $scope.data.show.episodes = episodes.items.slice(0, 5) + + }) + }); + + $scope.currenttrack = PlayQueue.getCurrent(); + $rootScope.$on('playqueuechanged', function() { + $scope.currenttrack = PlayQueue.getCurrent(); + }); + + $scope.play = function(trackuri) { + var trackuris = $scope.tracks.map(function(track) { + return track.uri; + }); + PlayQueue.clear(); + PlayQueue.enqueueList(trackuris); + PlayQueue.playFrom(trackuris.indexOf(trackuri)); + }; + + $scope.playall = function() { + var trackuris = $scope.tracks.map(function(track) { + return track.uri; + }); + PlayQueue.clear(); + PlayQueue.enqueueList(trackuris); + PlayQueue.playFrom(0); + }; + + $scope.toggleFromYourMusic = function(index) { + if ($scope.tracks[index].inYourMusic) { + API.removeFromMyTracks([$scope.tracks[index].id]).then(function(response) { + $scope.tracks[index].inYourMusic = false; + }); + } else { + API.addToMyTracks([$scope.tracks[index].id]).then(function(response) { + $scope.tracks[index].inYourMusic = true; + }); + } + }; + + }); + +})(); diff --git a/controllers/hashtag.js b/controllers/hashtag.js new file mode 100644 index 0000000..af4e5a3 --- /dev/null +++ b/controllers/hashtag.js @@ -0,0 +1,54 @@ +(function() { + + var module = angular.module('PlayerApp'); + + module.controller('HashtagController', function($scope, API, $location, PlayQueue, $routeParams) { + $scope.hashtag = $routeParams.hashtag + $scope.type = $location.search().type || null; + $scope.tracks = []; + $scope.data = { + type: 'hastag', + name: '#' + $scope.hashtag + '' + } + API.getSearchResults('#' + $scope.hashtag).then(function(results) { + console.log('got search results', results); + if ($scope.type) { + $scope.objects = results[$scope.type + 's'].items; + $scope.data = { + type: 'hashtag', + name: '#' + $scope.hashtag + ' in \'' + $scope.type + '\'' + } + } + /* $scope.tracks = results.tracks.items.slice(0, 5); + $scope.playlists = results.playlists.items.slice(0, 5); + $scope.artists = results.artists.items.slice(0, 5); + $scope.albums = results.albums.items.slice(0, 5);*/ + $scope.shows = results.shows.items.slice(0, 5); + $scope.episodes = results.episodes.items.slice(0, 5); + + + }); + + $scope.play = function(trackuri) { + var trackuris = $scope.tracks.map(function(track) { + return track.uri; + }); + PlayQueue.clear(); + PlayQueue.enqueueList(trackuris); + PlayQueue.playFrom(trackuris.indexOf(trackuri)); + }; + + $scope.toggleFromYourMusic = function(index) { + if ($scope.tracks[index].inYourMusic) { + API.removeFromMyTracks([$scope.tracks[index].id]).then(function(response) { + $scope.tracks[index].inYourMusic = false; + }); + } else { + API.addToMyTracks([$scope.tracks[index].id]).then(function(response) { + $scope.tracks[index].inYourMusic = true; + }); + } + }; + }); + +})(); diff --git a/controllers/player.js b/controllers/player.js index 38d1aa3..d038ef3 100644 --- a/controllers/player.js +++ b/controllers/player.js @@ -82,6 +82,9 @@ $scope.loadsearch = function() { console.log('search for', $scope.query); + if ($scope.query.indexOf('#') === 0) { + $scope.query = 'spotify:hashtag:' + $scope.query.substr(1) + } if ($scope.query.indexOf('spotify:') == 0) { let path = '/' + $scope.query.substr('spotify:'.length).replace(/\:/, '/') console.log(path) diff --git a/controllers/playlist.js b/controllers/playlist.js index 6a0da62..c7ccf23 100644 --- a/controllers/playlist.js +++ b/controllers/playlist.js @@ -50,7 +50,10 @@ }); }); promise = $scope.username ? API.getPlaylistTracks($scope.username, $scope.playlist) : API.getTracksInPlaylistById($scope.playlist) - + + API.getEpisodesInPlaylist($scope.playlist).then(results => { + debugger + }) promise.then(function(list) { console.log('got playlist tracks', list); var tot = 0; diff --git a/controllers/show.js b/controllers/show.js index d6be2a3..727bfa2 100644 --- a/controllers/show.js +++ b/controllers/show.js @@ -70,15 +70,15 @@ var i, j, temparray, chunk = 20; for (i = 0, j = ids.length; i < j; i += chunk) { - temparray = ids.slice(i, i + chunk); - var firstIndex = i; - (function(firstIndex){ - API.containsUserTracks(temparray).then(function(results) { - results.forEach(function(result, index) { - $scope.episodes[firstIndex + index].episode.inYourMusic = result; - }); + temparray = ids.slice(i, i + chunk); + var firstIndex = i; + (function(firstIndex){ + API.containsUserTracks(temparray).then(function(results) { + results.forEach(function(result, index) { + $scope.episodes[firstIndex + index].episode.inYourMusic = result; }); - })(firstIndex); + }); + })(firstIndex); } }); diff --git a/directives/app.js b/directives/app.js new file mode 100644 index 0000000..039cc1f --- /dev/null +++ b/directives/app.js @@ -0,0 +1,56 @@ +(function() { + + var module = angular.module('PlayerApp'); + module.directive('spotifyApp', function(Auth, $location) { + return { + restrict: 'E', + scope: { + bundle: '@bundle', + parameters: '@parameters' + }, + replace: false, + compile: function (tElem, tAttrs) { + var linkFunction = function($scope, element, attributes) { + element.html( + '' + ) + let iframe = element[0].querySelector('iframe') + iframe.src = 'http://' + attributes.bundle + '.buddhalow.net' + + iframe.addEventListener('load', function () { + console.log(attributes.parameters) + iframe.contentWindow.postMessage({ + 'action': 'parameters', + 'parameters': attributes.parameters.split(/\:/), + 'access_token': Auth.getAccessToken(), + }, '*') + }) + window.addEventListener('message', function (event) { + if (event.data.action === 'navigate') { + let uri = event.data.uri + let parts = uri.split(/\:/) + let bundle = parts[2] + let parameters = parts.splice(3) + if (bundle == attributes.bundle) { + if (uri.indexOf('spotify:app:' + attributes.bundle) === 0) { + iframe.contentWindow.postMessage({ + 'action': 'parameters', + 'parameters': parameters, + 'access_token': Auth.getAccessToken(), + }, '*') + $location.path('/app/' + attributes.bundle + '/' + parameters.join('/')).reload(false) + } else { + + $location.path('/' + parts.slice(1).join('/')) + } + + } + } + }) + }; + return linkFunction; + } + }; + }); + +})(); diff --git a/directives/notation.js b/directives/notation.js new file mode 100644 index 0000000..8dc5ecd --- /dev/null +++ b/directives/notation.js @@ -0,0 +1,45 @@ +(function() { + + var module = angular.module('PlayerApp'); + + module.directive('VexTab', function() { + return { + restrict: 'E', + scope: { + data: '=ngModel' + }, + replace: false, + compile: function (tElem, tAttrs) { + var linkFunction = function($scope, element, attributes) { + $scope.$watch('data', function() { + VF = Vex.Flow; + + // Create an SVG renderer and attach it to the DIV element named "boo". + var div = document.getElementById("boo") + var renderer = new VF.Renderer(div, VF.Renderer.Backends.SVG); + + // Size our svg: + renderer.resize(500, 500); + + // And get a drawing context: + var context = renderer.getContext(); + // Create a stave at position 10, 40 of width 400 on the canvas. + + var stave = new VF.Stave(10, 40, 400); + + // Add a clef and time signature. + + + // Connect it to the rendering context and draw! + stave.setContext(context).draw(); + $scope.data.sections.map((section) => { + stave.addClef("treble").addTimeSignature(section.time_signature + '/' + section.time_signature); + }) + }); + }; + return linkFunction; + } + }; + }); + +})(); diff --git a/index.html b/index.html index c32ac14..e590c0c 100644 --- a/index.html +++ b/index.html @@ -18,6 +18,7 @@ + @@ -36,6 +37,8 @@ + + @@ -65,7 +68,7 @@
      - SAMPLE PLAYER APPLICATION + THIRTIFY
      Signed in as {{profileUsername}} diff --git a/partials/app.html b/partials/app.html index ee5acd3..ea4013b 100644 --- a/partials/app.html +++ b/partials/app.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/partials/episode.html b/partials/episode.html new file mode 100644 index 0000000..58b64d7 --- /dev/null +++ b/partials/episode.html @@ -0,0 +1,70 @@ + + + +
      + + + + + + + + + + + + + + + + + +
      EPISDOEProgressTIMEPublished
      + + + {{t.name}} + + + {{t.duration_ms | displaytime}}{{t.release_date | timeago}}
      + Show all tracks + Show only current track +
      +
      +
      +
      +

      Description

      +

      {{data.description}}

      +
      +
      +
      + +
      +
      +
      +

      More by '{{data.show.name}}'

      + +
      +
      +
      + diff --git a/partials/generic_header.html b/partials/generic_header.html index a4cb7eb..ae03c85 100644 --- a/partials/generic_header.html +++ b/partials/generic_header.html @@ -10,7 +10,9 @@

      {{data.name}}

      by {{author.name || author.id}}

      -

      from {{data.album.name}} by {{author.name || author.id}} +

      from {{data.album.name}} by {{author.name || author.id}} +

      +

      from {{data.show.name}} by {{author.name || author.id}}

      PLAY ALL diff --git a/partials/hashtag.html b/partials/hashtag.html new file mode 100644 index 0000000..c7d0bf1 --- /dev/null +++ b/partials/hashtag.html @@ -0,0 +1,142 @@ + +
      +
      +
      + +
      +
      +
      +
      +
      +
      +

      PLAYLISTS

      + +
      +
      +

      ARTISTS

      + +
      +
      + +
      +
      + +
      +
      +

      EPISODES

      + + + + + + + + + + + + + + + +
      EPISODESHOWDURATION
      + + + {{t.name}} + + {{t.show.name}} + + {{ t.duration_ms | displaytime }} +
      +
      + +
      +

      TRACKS

      + + + + + + + + + + + + + + + + + + + +
      SONGARTISTALBUMTIMEPOPULARITY
      + + + {{t.name}} + + {{t.artists[0].name}} + + {{t.album.name}} + + {{ t.duration_ms | displaytime }} + +
      +
      +
      +
      +
      + +
      +
      diff --git a/partials/show.html b/partials/show.html index f2f0f05..516f750 100644 --- a/partials/show.html +++ b/partials/show.html @@ -20,11 +20,13 @@

      Episodes

      - {{t.name}} + {{t.name}}

      {{t.description}}

      - + + +

      Published {{t.release_date | timeago}}

      diff --git a/services/api.js b/services/api.js index 7bbb2c3..e691e85 100644 --- a/services/api.js +++ b/services/api.js @@ -10,6 +10,7 @@ module.factory('API', function(Auth, $q, $http) { var baseUrl = 'https://api.spotify.com/v1'; + var baseUrl2 = 'https://api.spotify.com/v2'; window.onSpotifyWebPlaybackSDKReady = () => { const token = Auth.getAccessToken(); @@ -266,6 +267,36 @@ return ret.promise; }, + getEpisodeById: function(identifier) { + var ret = $q.defer(); + $http.get(baseUrl + '/episodes/' + encodeURIComponent(identifier), { + headers: { + 'Authorization': 'Bearer ' + Auth.getAccessToken() + } + }).success(function(r) { + console.log('got episode', r); + ret.resolve(r); + }); + return ret.promise; + }, + + addTracksToPlaylist(playlist_id, uris) { + var ret = $q.defer(); + $http.post( + baseUrl + '/playlists/' + encodeURIComponent(playlist_id) + '/tracks', + { uris : [ uris ] }, + { + headers: { + 'Authorization': 'Bearer ' + Auth.getAccessToken() + }, + } + ).success(function(r) { + console.log('added playlist tracks', r); + ret.resolve(r); + }); + return ret.promise; + }, + getTracksInPlaylistById: function(identifier, snapshot_id) { var ret = $q.defer(); $http.get(baseUrl + '/playlists/' + encodeURIComponent(identifier) + '/tracks', { @@ -278,6 +309,19 @@ }); return ret.promise; }, + + getEpisodesInPlaylist: function(identifier, snapshot_id) { + var ret = $q.defer(); + $http.get(baseUrl + '/playlists/' + encodeURIComponent(identifier) + '/episodes', { + headers: { + 'Authorization': 'Bearer ' + Auth.getAccessToken() + } + }).success(function(r) { + console.log('got playlist tracks', r); + ret.resolve(r); + }); + return ret.promise; + }, getEpisodesInShow: function(identifier) { var ret = $q.defer(); $http.get(baseUrl + '/shows/' + encodeURIComponent(identifier) + '/episodes', { From 6dfe1cbb0c1b2b636dcc5764f38e4a3203017293 Mon Sep 17 00:00:00 2001 From: Alexander Forselius Date: Thu, 13 Sep 2018 05:49:21 +0200 Subject: [PATCH 10/12] Added filter feature in playlist --- app.js | 50 +++++++++- controllers/chart.js | 171 ++++++++++++++++++++++++++++++++++ controllers/playlist.js | 6 ++ controllers/publisher.js | 2 +- controllers/show.js | 3 +- directives/tab.js | 2 +- filters/i18n.js | 9 ++ index.html | 1 + lang/sv.json | 43 +++++++++ partials/album.html | 20 ++-- partials/artist.html | 18 ++-- partials/audiobook.html | 19 ++-- partials/author.html | 8 +- partials/browse.html | 10 +- partials/chart.html | 76 +++++++++++++++ partials/country.html | 33 ++----- partials/episode.html | 12 +-- partials/generic_header.html | 14 +-- partials/hashtag.html | 2 +- partials/label.html | 72 ++++++++------ partials/playlist.html | 26 ++++-- partials/publisher.html | 2 +- partials/recommendations.html | 10 +- partials/show.html | 76 ++++++++------- services/api.js | 4 +- services/i18n.js | 27 ++++++ style.css | 16 ++++ 27 files changed, 573 insertions(+), 159 deletions(-) create mode 100644 controllers/chart.js create mode 100644 filters/i18n.js create mode 100644 lang/sv.json create mode 100644 partials/chart.html create mode 100644 services/i18n.js diff --git a/app.js b/app.js index 5766d84..178e2b2 100644 --- a/app.js +++ b/app.js @@ -2,6 +2,47 @@ var app = angular.module('PlayerApp', ['ngRoute']); + app.factory('I18n', ['$q', '$http', function($q, $http) { + let locale = navigator.language + + var lang = {} + try { + var xhr = new XMLHttpRequest(); + xhr.open('GET', '/lang/' + locale + '.json', false) + xhr.send(null) + lang = JSON.parse(xhr.responseText) + } catch (e) { + + } + if (!lang) { + return {} + } + var i18n = { + t: function (input) { + let translatedString = lang[input] + if (!translatedString) { + translatedString = input + } + let args = Array.from(arguments).slice(1) + for (let i = 0; i < args.length; i++) { + translatedString = translatedString.replace('%' + i, args[i]) + } + return translatedString + } + } + return i18n + }]) + app.filter('trustThisUrl', ["$sce", function ($sce) { + return function (val) { + return $sce.trustAsResourceUrl(val); + }; + }]); + app.filter('locale', ['I18n', function(I18n) { + return function(input) { + return I18n.t(input, Array.from(arguments).slice(1)) + }; + }]) + app.config(function($routeProvider, $locationProvider) { $locationProvider.html5Mode(true) $routeProvider. @@ -102,6 +143,10 @@ templateUrl: 'partials/hashtag.html', controller: 'HashtagController' }). + when('/charts?/:identifier', { + templateUrl: 'partials/chart.html', + controller: 'ChartController' + }). otherwise({ redirectTo: '/' }); @@ -213,10 +258,5 @@ checkUser(); }); - app.filter('trustThisUrl', ["$sce", function ($sce) { - return function (val) { - return $sce.trustAsResourceUrl(val); - }; - }]); })(); diff --git a/controllers/chart.js b/controllers/chart.js new file mode 100644 index 0000000..c867b40 --- /dev/null +++ b/controllers/chart.js @@ -0,0 +1,171 @@ +(function() { + + var module = angular.module('PlayerApp'); + + module.controller('ChartController', function($scope, $rootScope, API, PlayQueue, $routeParams, Auth, $sce) { + $scope.playlist = $routeParams.identifier; + $scope.username = $routeParams.username; + $scope.name = ''; + $scope.tracks = []; + $scope.data = null; + $scope.total_duration = 0; + + $scope.currenttrack = PlayQueue.getCurrent(); + $scope.isFollowing = false; + $scope.isFollowHovered = false; + $scope.q = '' + + $rootScope.$on('playqueuechanged', function() { + $scope.currenttrack = PlayQueue.getCurrent(); + }); + let promise = $scope.username ? API.getPlaylist($scope.username, $scope.playlist) : API.getPlaylistById($scope.playlist) + promise.then(function(list) { + console.log('got playlist', list); + $scope.name = list.name; + $scope.data = list; + $scope.username = list.owner.id + $scope.data.authors = [list.owner] + $scope.data.type = 'chart' + $scope.data.description = $sce.trustAsHtml(list.description); + let img = document.createElement('img') + img.crossOrigin = "Anonymous"; + img.src = $scope.data.images && $scope.data.images.length > 0 ? $scope.data.images[0].url : '' + img.addEventListener('load', function() { + var vibrant = new Vibrant(img); + + var swatches = vibrant.swatches() + let i = 0; + + for (var swatch in swatches) { + if (i == 1) { + if (swatches.hasOwnProperty(swatch) && swatches[swatch]) { + let hex = swatches[swatch].getHex() + console.log(swatch, hex) + document.documentElement.style.setProperty('--vibrant-color', hex + '55') + console.log(hex) + + break; + } + } + i++ + } + }); + }); + promise = $scope.username ? API.getPlaylistTracks($scope.username, $scope.playlist) : API.getTracksInPlaylistById($scope.playlist) + + API.getEpisodesInPlaylist($scope.playlist).then(results => { + debugger + }) + promise.then(function(list) { + console.log('got playlist tracks', list); + var tot = 0; + list.items.forEach(function(track) { + tot += track.track.duration_ms; + }); + $scope.tracks = list.items; + $scope.visibleTracks = $scope.tracks.filter( + o => { + + } + ) + console.log('tot', tot); + $scope.total_duration = tot; + + // find out if they are in the user's collection + var ids = $scope.tracks.map(function(track) { + return track.track.id; + }); + + var i, j, temparray, chunk = 20; + for (i = 0, j = ids.length; i < j; i += chunk) { + temparray = ids.slice(i, i + chunk); + var firstIndex = i; + (function(firstIndex){ + API.containsUserTracks(temparray).then(function(results) { + results.forEach(function(result, index) { + $scope.tracks[firstIndex + index].track.inYourMusic = result; + }); + }); + })(firstIndex); + } + }); + + promise = $scope.username ? API.isFollowingPlaylist($scope.username, $scope.playlist) : API.isFollowingPlaylistById($scope.playlist) + + API.isFollowingPlaylist($scope.username, $scope.playlist).then(function(booleans) { + console.log("Got following status for playlist: " + booleans[0]); + $scope.isFollowing = booleans[0]; + }); + + $scope.follow = function(isFollowing) { + if (isFollowing) { + let promise = $scope.username ? API.unfollowPlaylist($scope.username, $scope.playlist) : API.unfollowPlaylistById($scope.playlist) + promise.then(function() { + $scope.isFollowing = false; + $rootScope.$emit('playlistsubscriptionchange'); + }); + } else { + let promise = $scope.username ? API.followPlaylist($scope.username, $scope.playlist) : API.followPlaylistById($scope.playlist) + promise.then(function () { + $scope.isFollowing = true; + $rootScope.$emit('playlistsubscriptionchange'); + }); + } + }; + + $scope.play = function(trackuri) { + var trackuris = $scope.tracks.map(function(track) { + return track.track.uri; + }); + PlayQueue.clear(); + PlayQueue.enqueueList(trackuris); + PlayQueue.playFrom(trackuris.indexOf(trackuri)); + }; + + $scope.playall = function() { + var trackuris = $scope.tracks.map(function(track) { + return track.track.uri; + }); + PlayQueue.clear(); + PlayQueue.enqueueList(trackuris); + PlayQueue.playFrom(0); + }; + + $scope.toggleFromYourMusic = function(index) { + if ($scope.tracks[index].track.inYourMusic) { + API.removeFromMyTracks([$scope.tracks[index].track.id]).then(function(response) { + $scope.tracks[index].track.inYourMusic = false; + }); + } else { + API.addToMyTracks([$scope.tracks[index].track.id]).then(function(response) { + $scope.tracks[index].track.inYourMusic = true; + }); + } + }; + + $scope.menuOptionsPlaylistTrack = function() { + if ($scope.username === Auth.getUsername()) { + return [[ + 'Delete', + function ($itemScope) { + var position = $itemScope.$index; + let promise = $scope.username ? API.removeTrackFromPlaylist( + $scope.username, + $scope.playlist, + $itemScope.t.track, position) : + API.removeTrackFromPlaylistById( + $scope.playlist, + $itemScope.t.track, position) + + promise.then(function() { + $scope.tracks.splice(position, 1); + }); + }]] + } else { + return null; + } + }; + + }); + +})(); diff --git a/controllers/playlist.js b/controllers/playlist.js index c7ccf23..a30d08c 100644 --- a/controllers/playlist.js +++ b/controllers/playlist.js @@ -13,6 +13,7 @@ $scope.currenttrack = PlayQueue.getCurrent(); $scope.isFollowing = false; $scope.isFollowHovered = false; + $scope.q = '' $rootScope.$on('playqueuechanged', function() { $scope.currenttrack = PlayQueue.getCurrent(); @@ -61,6 +62,11 @@ tot += track.track.duration_ms; }); $scope.tracks = list.items; + $scope.visibleTracks = $scope.tracks.filter( + o => { + + } + ) console.log('tot', tot); $scope.total_duration = tot; diff --git a/controllers/publisher.js b/controllers/publisher.js index 29b7099..28f0a02 100644 --- a/controllers/publisher.js +++ b/controllers/publisher.js @@ -13,7 +13,7 @@ API.findShows($scope.query).then(function(results) { console.log('got search results', results); - $scope.shows = results.shows.items; + $scope.shows = results.shows.items.filter(s => s.publisher.indexOf($scope.query) !== -1); if ($scope.shows.length > 0) { //$scope.data.images = $scope.shows[0].images } diff --git a/controllers/show.js b/controllers/show.js index 727bfa2..a9dc954 100644 --- a/controllers/show.js +++ b/controllers/show.js @@ -23,7 +23,8 @@ console.log('got show', list); $scope.name = list.name; $scope.data = list; - $scope.data.description = $sce.trustAsHtml(list.description); + $scope.data.showDescription = $sce.trustAsHtml(list.description); + $scope.data.description = '' $scope.data.authors = [{ id: $scope.data.publisher, name: $scope.data.publisher, diff --git a/directives/tab.js b/directives/tab.js index 0562591..7cdc422 100644 --- a/directives/tab.js +++ b/directives/tab.js @@ -5,7 +5,7 @@ restrict: 'E', scope: { section: '=section', - label: '=label' + label: '@' }, compile: function (element, attributes) { diff --git a/filters/i18n.js b/filters/i18n.js new file mode 100644 index 0000000..4ee6fd5 --- /dev/null +++ b/filters/i18n.js @@ -0,0 +1,9 @@ +(function() { + + var module = angular.module('PlayerApp'); + module.filter('i18n', function(I18n) { + return function(input) { + return I18n.t(input, arguments.slice(1)) + }; + }) +}) \ No newline at end of file diff --git a/index.html b/index.html index e590c0c..5184124 100644 --- a/index.html +++ b/index.html @@ -33,6 +33,7 @@ + diff --git a/lang/sv.json b/lang/sv.json new file mode 100644 index 0000000..92d8e33 --- /dev/null +++ b/lang/sv.json @@ -0,0 +1,43 @@ +{ + "no-results-for": "Inga resultat för '%s'", + "artist": "Artist", + "fan": "Fan", + "playlist": "Spellista", + "track": "Spår", + "Follow": "Följ", + "Unfollow": "Avfölj", + "album": "Album", + "audiobook": "Ljudbok", + "overview": "Översikt", + "categories": "Kategorier", + "new-releases": "Nya releaser", + "shows": "Program", + "av": "by", + "about": "Om", + "genres-and-themes": "Genrer och Teman", + "followers": "Följare", + "episodes": "Avsnitt", + "author": "Författare", + "book": "Bok", + "chapter": "Kapitel", + "user": "Användare", + "public-playlists": "Publika spellistor", + "show": "Program", + "track": "Spår", + "popular-tracks": "Populära låtar", + "singles": "Singlar", + "albums": "Album", + "more-by": "Mer av '%0'", + "label": "Skivbolag", + "publisher": "Utgivare", + "shows": "Program", + "recommended-tracks": "Rekommendare låtar", + "fan-also-likes": "Fan gillar också", + "error-loading-related-artists": "Ett fel uppstod vid hämtningen av relaterade artister", + "songs": "Låtar", + "popularity": "Popularitet", + "filter": "Filtrera", + "episode": "Avsnitt", + "added": "Tillagd", + "time": "Tid" +} \ No newline at end of file diff --git a/partials/album.html b/partials/album.html index b1ba297..7a0d288 100644 --- a/partials/album.html +++ b/partials/album.html @@ -1,6 +1,14 @@ + +
      +
      +
      + +
      +
      +
      @@ -11,12 +19,12 @@ # - TRACK - TIME - POPULARITY + {{ 'track' | locale }} + {{ 'time' | locale }} + {{ 'popularity' | locale }} - + {{t.track_number}} @@ -42,7 +50,7 @@
      -

      More by '{{data.artists[0].name}}'

      +

      {{ 'more-by' | locale:data.artists[0].name }}