Skip to content

Commit

Permalink
add "up next" info to streama-app
Browse files Browse the repository at this point in the history
  • Loading branch information
dularion committed Sep 16, 2018
1 parent 9eb7ca5 commit 475630d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"angular-translate": "^2.14.0",
"streama-i18n": "1.1.3",
"toastr": "^2.1.3",
"streama-video-player": "v1.5.15",
"streama-video-player": "v1.5.16",
"alertify": "^0.3.10",
"mousetrap": "^1.6.0",
"angular-bootstrap": "^2.5.0"
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "0.0.1",
"description": "streama: An Ionic project",
"devDependencies": {
"@ionic/v1-toolkit": "1.0.8",
"gulp": "^3.5.6",
"gulp-clean-css": "^3.7.0",
"gulp-rename": "^1.2.0",
Expand Down Expand Up @@ -40,4 +41,4 @@
"android"
]
}
}
}
9 changes: 8 additions & 1 deletion www/js/player/services/player.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ angular.module('streama.player').factory('playerService',
videoOptions.episodeList = _.groupBy(episodes, 'season_number');
videoOptions.hasNextEpisode = _.get(video, 'nextEpisode');

videoOptions.nextVideo = video.nextEpisode || video.nextVideo;
videoOptions.isAutoplayNextActive = !!video.nextEpisode;

if(videoOptions.nextVideo){
videoOptions.showNextButton = true;
}

videoOptions.showEpisodeBrowser = episodes ? true : false;
videoOptions.currentEpisode = {
episode: video.episode_number,
Expand Down Expand Up @@ -101,7 +108,7 @@ angular.module('streama.player').factory('playerService',
*/
function onVideoPlay(videoElement, socketData) {
var that = this;
console.log('%c onVideoPlay', 'color: deeppink; font-weight: bold; text-shadow: 0 0 5px deeppink;');
// console.log('%c onVideoPlay', 'color: deeppink; font-weight: bold; text-shadow: 0 0 5px deeppink;');

saveViewingStatus(that, videoElement);

Expand Down

0 comments on commit 475630d

Please sign in to comment.