Skip to content

Commit 5252068

Browse files
authored
Merge pull request #174 from BuildFire/white-screen-issue
fix(widget-side): fix white screen issue
2 parents b83ce93 + ae81fea commit 5252068

1 file changed

Lines changed: 8 additions & 10 deletions

File tree

widget/controllers/widget.feed.controller.js

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
var isUnchanged=false;
5757
if(cache.items && result.items && result.items.length){
5858
result.items = result.items.filter(item => (
59-
item.snippet &&
60-
item.snippet.thumbnails &&
59+
item.snippet &&
60+
item.snippet.thumbnails &&
6161
Object.keys(item.snippet.thumbnails).length));
6262

6363
if(cache.items.length == result.items.length){
@@ -76,7 +76,7 @@
7676
WidgetFeed.videos = [];
7777
WidgetFeed.busy = false;
7878
WidgetFeed.nextPageToken = null;
79-
setTimeout(() => {
79+
setTimeout(() => {
8080
if(!$rootScope.loading){
8181
getFeedVideosSuccess(result);
8282
}
@@ -94,7 +94,7 @@
9494
VIDEO_COUNT.LIMIT,
9595
null
9696
).then(compareDataFromCacheAndYouTube, errorWithComperation);
97-
}
97+
}
9898
};
9999
/*
100100
* Fetch user's data from datastore
@@ -283,8 +283,8 @@
283283
// double check that result is not null
284284
if (result && result.items && result.items.length) {
285285
result.items = result.items.filter(item => (
286-
item.snippet &&
287-
item.snippet.thumbnails &&
286+
item.snippet &&
287+
item.snippet.thumbnails &&
288288
Object.keys(item.snippet.thumbnails).length));
289289

290290
$rootScope.showEmptyState = false;
@@ -488,11 +488,11 @@
488488
WidgetFeed.openDetailsPage = function(video, pushToHistory = true) {
489489
if (WidgetFeed.screenAnimationInProgress) return;
490490
WidgetFeed.screenAnimationInProgress = true;
491-
491+
492492
if (video.snippet && video.snippet.resourceId && video.snippet.resourceId.videoId) {
493493
video.id = video.snippet.resourceId.videoId;
494494
}
495-
VideoCache.setCache({...video, pushToHistory});
495+
VideoCache.setCache({...video, pushToHistory});
496496
};
497497
$scope.$watch('$root.currentVideo', function() {
498498
const video = $rootScope.currentVideo;
@@ -562,8 +562,6 @@
562562
};
563563

564564
$rootScope.$on("ROUTE_CHANGED", function(e, data) {
565-
WidgetFeed.data = data;
566-
567565
WidgetFeed.updateAuthListeners();
568566

569567
if (WidgetFeed.data && !WidgetFeed.data.design) {

0 commit comments

Comments
 (0)