Merge pull request #256 from BuildFire/feat/migrate-to-video-js

enable adding videos to global playlist

Author: mas-iota

widget/controllers/widget.home.controller.js

@@ -620,7 +620,7 @@
                             $rootScope.addAllToPlaylistLoading = false;
                             if (!$scope.$$phase) $scope.$apply();
                         } else {
-                            var filteredItems = WidgetHome.items.filter(el => !$rootScope.isInGlobalPlaylist(el.id)).filter(item => item.data.audioUrl);
+                            var filteredItems = WidgetHome.items.filter(el => !$rootScope.isInGlobalPlaylist(el.id)).filter(item => (item.data.audioUrl || item.data.videoUrl));
                             var itemsToAdd = [...filteredItems].splice(0, freeSlots);
                             GlobalPlaylist.insertAndUpdateAll(itemsToAdd).then(() => {
                                 for (let item of itemsToAdd) {
@@ -1118,27 +1118,21 @@
                         });
                     };
 
-                    if ($rootScope.globalPlaylist && $rootScope.online) {
+                    if ($rootScope.online) {
                         getCurrentUser(() => {
                             getGlobalPlaylistLimit();
 
                             getGlobalPlaylistItems()
                                 .then(getRecords)
                                 .finally(() => {
-                                    $rootScope.loadingGlobalPlaylist = false;
+                                    setTimeout(() => {
+                                        WidgetHome.isBusy = false;
+                                        $rootScope.loadingData = false;
+                                        $rootScope.loadingGlobalPlaylist = false;
+                                        if (!$scope.$$phase) $scope.$apply();
+                                    }, 0);
                                 });
                         });
-                    } else if ($rootScope.online) {
-                        getGlobalPlaylistItems()
-                            .then(getRecords)
-                            .finally(() => {
-                                setTimeout(() => {
-                                    WidgetHome.isBusy = false;
-                                    $rootScope.loadingData = false;
-                                    $rootScope.loadingGlobalPlaylist = false;
-                                    if (!$scope.$$phase) $scope.$apply();
-                                }, 0);
-                            });
                     } else {
                         getCachedItems((err, res) => {});
                     }
@@ -1246,7 +1240,7 @@
                         listItems.push({ id: "openLinks", text: getString("homeDrawer.openLinks") });
                     }
 
-                    if (WidgetHome.media.data.content.globalPlaylist && $rootScope.online && item.data.audioUrl) {
+                    if (WidgetHome.media.data.content.globalPlaylist && $rootScope.online && (item.data.audioUrl || item.data.videoUrl)) {
                         if ($rootScope.isInGlobalPlaylist(item.id)) {
                             listItems.push({ id: "removeFromPlaylist", text: getString("homeDrawer.removeFromPlaylist") });
                         }

widget/controllers/widget.media.controller.js

@@ -142,7 +142,7 @@
                         listItems.push({ id: "openLinks", text: getString("itemDrawer.openLinks") });
                     }
 
-                    if (WidgetMedia.media.data.content.globalPlaylist && $rootScope.online && WidgetMedia.item.data.audioUrl) {
+                    if (WidgetMedia.media.data.content.globalPlaylist && $rootScope.online && (WidgetMedia.item.data.audioUrl || WidgetMedia.item.data.videoUrl)) {
                         if ($rootScope.isInGlobalPlaylist(WidgetMedia.item.id)) {
                             listItems.push({ id: "removeFromPlaylist", text: getString("itemDrawer.removeFromPlaylist") });
                         }
@@ -689,6 +689,8 @@
                         Location.goToHome();
                     } else if (event.name === EVENTS.DESIGN_LAYOUT_CHANGE) {
                         WidgetMedia.media.data.design = event.message.design
+                    } else if (event.name === EVENTS.SETTINGS_CHANGE) {
+                        WidgetMedia.media.data.content = event.message.itemUpdatedData;
                     }
 
                     if ($rootScope.autoPlay || $rootScope.skipMediaPage) {

widget/services.js

@@ -614,7 +614,6 @@
                     controls: true,
                     techOrder: ["html5", "youtube", "vimeo"],
                     enableDocumentPictureInPicture: true,
-                    autoplay: $rootScope.autoPlay
                 });
 
                 addNextPreviousButtons();
@@ -625,13 +624,6 @@
                     type: videoType,
                 });
 
-                // this interval is to handle youtube videos autoplay
-                if ($rootScope.autoPlay) {
-                    playInterval = setInterval(() => {
-                        play();
-                    }, 500)
-                }
-
                 // to handle click on mobile
                 vidPlayer.controlBar.playToggle.on("touchend", function () {
                     if (vidPlayer.paused()) {
@@ -701,9 +693,23 @@
                 if (type === 'video/mp4') {
                     vidPlayer.on('loadedmetadata', function () {
                         callback();
+
+                         if ($rootScope.autoPlay) {
+                            playInterval = setInterval(() => {
+                                play();
+                            }, 500);
+                        }
                     });
                 } else {
-                    callback();
+                    vidPlayer.tech().on("ready", function () {
+                        if ($rootScope.autoPlay) {
+                            playInterval = setInterval(() => {
+                                play();
+                            }, 500);
+                        }
+
+                       callback();
+                    });
                 }
             }