Skip to content

Commit 170126a

Browse files
mas-iotamas-iota
authored
Merge pull request #84 from BuildFire/fix/long-spinner-time
Fix/long spinner time - WEB2-13089
2 parents 223a9c1 + 521bf2f commit 170126a

6 files changed

Lines changed: 73 additions & 64 deletions

File tree

‎control/content/index.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<script src="../../../../scripts/angular/angular.min.js"></script>
1616
<script src="../../../../scripts/angular/angular-route.min.js"></script>
1717
<script src="../../../../scripts/buildfire/components/carouselLight/carouselLightEditor.js"></script>
18-
<script src="../../../../scripts/buildfire/components/pluginInstance/sortableList.js"></script>
1918
<script src="../../../../scripts/buildfire/components/actionItems/sortableList.js"></script>
2019
<script src="../../../../scripts/angular/ui-bootstrap.min.js"></script>
2120
<script src="../../../../scripts/tinymce/tinymce.min.js"></script>

‎widget/controllers/widget.bookmark.controller.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
}
9191
var err = function (error) {
9292
Buildfire.spinner.hide();
93-
console.log("============ There is an error in getting data", error);
93+
9494
}, result = function (result) {
9595
Buildfire.spinner.hide();
9696
console.log("===========search", result);
@@ -155,11 +155,11 @@
155155
$rootScope.seminarLastDocument.nextAvailableIn = Date.now() + ($rootScope.data.content.seminarDelay.value * 60 * 1000);
156156
buildfire.userData.save($rootScope.seminarLastDocument, "seminarLastDocument", false, () => {});
157157
}
158-
}
158+
}
159159
// If item rank is bigger than the current rank by one and it reached it's open time
160160
else if (($rootScope.seminarLastDocument.rank + 1) === itemRank && Date.now() >= $rootScope.seminarLastDocument.nextAvailableIn) {
161161
// Change the current rank to the item rank
162-
$rootScope.seminarLastDocument.rank = itemRank;
162+
$rootScope.seminarLastDocument.rank = itemRank;
163163
// Set the time for when the next item will open
164164
$rootScope.seminarLastDocument.nextAvailableIn = Date.now() + ($rootScope.data.content.seminarDelay.value * 60 * 1000);
165165
buildfire.userData.save($rootScope.seminarLastDocument, "seminarLastDocument", false, () => {});
@@ -228,7 +228,6 @@
228228
};
229229

230230
WidgetBookmark.removeBookmark = function (item, index) {
231-
Buildfire.spinner.show();
232231
var successRemove = function (result) {
233232
Buildfire.spinner.hide();
234233
WidgetBookmark.items.splice(index, 1);
@@ -251,8 +250,10 @@
251250
Buildfire.spinner.hide();
252251
return console.error('There was a problem removing your data');
253252
};
254-
if (WidgetBookmark.currentLoggedInUser && WidgetBookmark.currentLoggedInUser._id)
253+
if (WidgetBookmark.currentLoggedInUser && WidgetBookmark.currentLoggedInUser._id) {
254+
Buildfire.spinner.show();
255255
UserData.delete(item.bookmarkId, TAG_NAMES.SEMINAR_BOOKMARKS, WidgetBookmark.currentLoggedInUser._id).then(successRemove, errorRemove)
256+
}
256257
};
257258

258259
$scope.$on("$destroy", function () {

‎widget/controllers/widget.home.controller.js‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
if (errorOrConfirmed === true || (result && result.selectedButton && result.selectedButton.key === 'confirm')) {
232232
Buildfire.spinner.show();
233233
WidgetHome.getAllNotes(data.itemId, (notesToDelete) => {
234-
{
234+
Buildfire.spinner.hide();
235235
notesToDelete.forEach(note => {
236236
UserData.delete(note.id, TAG_NAMES.SEMINAR_NOTES, WidgetHome.currentLoggedInUser._id).then(() => {
237237
console.log("deleted note", note);
@@ -249,10 +249,7 @@
249249
console.error("error inserting note", e);
250250
});
251251
});
252-
}
253252
});
254-
255-
Buildfire.spinner.hide();
256253
}
257254
});
258255
}
@@ -415,19 +412,20 @@
415412
};
416413

417414
WidgetHome.getBookMarkData = function (setBookMarks) {
418-
Buildfire.spinner.show();
419415
var err = function (error) {
420416
Buildfire.spinner.hide();
421-
console.log("============ There is an error in getting data", error);
417+
422418
}, result = function (result) {
423419
Buildfire.spinner.hide();
424420
console.log("===========Bookmarks", result);
425421
WidgetHome.bookmarks = result;
426422
if (setBookMarks)
427423
WidgetHome.setBookmarks();
428424
};
429-
if (WidgetHome.currentLoggedInUser && WidgetHome.currentLoggedInUser._id)
425+
if (WidgetHome.currentLoggedInUser && WidgetHome.currentLoggedInUser._id) {
426+
Buildfire.spinner.show();
430427
UserData.search({}, TAG_NAMES.SEMINAR_BOOKMARKS).then(result, err);
428+
}
431429
};
432430

433431
WidgetHome.setBookmarks = function () {
@@ -717,7 +715,7 @@
717715
});
718716
};
719717

720-
buildfire.auth.onLogin(loginCallback);
718+
buildfire.auth.onLogin(loginCallback, true);
721719

722720
var logoutCallback = function () {
723721
WidgetHome.currentLoggedInUser = null;
@@ -727,7 +725,7 @@
727725
$scope.$apply();
728726
};
729727

730-
buildfire.auth.onLogout(logoutCallback);
728+
buildfire.auth.onLogout(logoutCallback, true);
731729

732730
/**
733731
* Check for current logged in user, if not show ogin screen
@@ -768,8 +766,7 @@
768766
};
769767

770768
WidgetHome.addToBookmark = function (item, isBookmarked, index) {
771-
console.log("$$$$$$$$$$$$$$$$$", item, isBookmarked, index);
772-
Buildfire.spinner.show();
769+
773770
if (isBookmarked && item.bookmarkId) {
774771
var successRemove = function (result) {
775772
Buildfire.spinner.hide();
@@ -792,8 +789,10 @@
792789
Buildfire.spinner.hide();
793790
return console.error('There was a problem removing your data');
794791
};
795-
if (WidgetHome.currentLoggedInUser && WidgetHome.currentLoggedInUser._id)
792+
if (WidgetHome.currentLoggedInUser && WidgetHome.currentLoggedInUser._id) {
793+
Buildfire.spinner.show();
796794
UserData.delete(item.bookmarkId, TAG_NAMES.SEMINAR_BOOKMARKS, WidgetHome.currentLoggedInUser._id).then(successRemove, errorRemove);
795+
}
797796
} else {
798797
WidgetHome.bookmarkItem = {
799798
data: {
@@ -823,8 +822,10 @@
823822
Buildfire.spinner.hide();
824823
return console.error('There was a problem saving your data');
825824
};
826-
if (WidgetHome.currentLoggedInUser && WidgetHome.currentLoggedInUser._id)
825+
if (WidgetHome.currentLoggedInUser && WidgetHome.currentLoggedInUser._id) {
826+
Buildfire.spinner.show();
827827
UserData.insert(WidgetHome.bookmarkItem.data, TAG_NAMES.SEMINAR_BOOKMARKS).then(successItem, errorItem);
828+
}
828829
}
829830
};
830831

‎widget/controllers/widget.item.controller.js‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,11 @@
8888
};
8989

9090
var getEventDetails = function () {
91-
Buildfire.spinner.show();
9291
var success = function (result) {
9392
Buildfire.spinner.hide();
9493
WidgetItem.item = result;
9594

9695
//$rootScope.$broadcast("NEW_ITEM_ADDED_UPDATED");
97-
console.log("========ingeteventdetails", result);
98-
9996
if (!WidgetItem.item.data.itemListBgImage) {
10097
$rootScope.itemDetailbackgroundImage = "";
10198
} else {
@@ -114,8 +111,8 @@
114111
console.error('Error In Fetching Event', err);
115112
};
116113

117-
console.log(">>>>>>>>>>", currentView);
118114
if (currentView.params && currentView.params.itemId) {
115+
Buildfire.spinner.show();
119116
DataStore.getById(currentView.params.itemId, TAG_NAMES.SEMINAR_ITEMS).then(success, error);
120117
}
121118
};
@@ -149,7 +146,7 @@
149146
});
150147
};
151148

152-
buildfire.auth.onLogin(loginCallback);
149+
buildfire.auth.onLogin(loginCallback, true);
153150

154151
/*
155152
* Fetch user's data from datastore
@@ -269,8 +266,7 @@
269266

270267
WidgetItem.addNoteToItem = function () {
271268
WidgetItem.inInsertNote = true;
272-
Buildfire.spinner.show();
273-
269+
274270
WidgetItem.itemNote = {
275271
noteTitle: WidgetItem.Note.noteTitle,
276272
noteDescription: WidgetItem.Note.noteDescription,
@@ -279,7 +275,7 @@
279275
dateAdded: new Date(),
280276
itemRank: WidgetItem.item.data.rank
281277
};
282-
278+
283279
var successItem = function (result) {
284280
Buildfire.spinner.hide();
285281
console.log("Inserted Item Note", result);
@@ -295,8 +291,10 @@
295291
Buildfire.spinner.hide();
296292
return console.error('There was a problem saving your data');
297293
};
298-
if (WidgetItem.currentLoggedInUser && WidgetItem.currentLoggedInUser._id)
294+
if (WidgetItem.currentLoggedInUser && WidgetItem.currentLoggedInUser._id) {
295+
Buildfire.spinner.show();
299296
UserData.insert(WidgetItem.itemNote, TAG_NAMES.SEMINAR_NOTES, WidgetItem.currentLoggedInUser._id).then(successItem, errorItem);
297+
}
300298
};
301299

302300
WidgetItem.getAllNotes = function (cb) {
@@ -326,11 +324,10 @@
326324
};
327325

328326
WidgetItem.getNoteList = function () {
329-
Buildfire.spinner.show();
330327
searchOptions.filter = { "$or": [{ "$json.itemID": { "$eq": WidgetItem.item.id } }] };
331328
var err = function (error) {
332329
Buildfire.spinner.hide();
333-
console.log("============ There is an error in getting data", error);
330+
334331
}, result = function (result) {
335332
Buildfire.spinner.hide();
336333
console.log("===========Search Note", result, searchOptions);
@@ -340,8 +337,10 @@
340337
WidgetItem.busy = false;
341338
}
342339
};
343-
if (WidgetItem.currentLoggedInUser && WidgetItem.currentLoggedInUser._id)
340+
if (WidgetItem.currentLoggedInUser && WidgetItem.currentLoggedInUser._id) {
341+
Buildfire.spinner.show();
344342
UserData.search(searchOptions, TAG_NAMES.SEMINAR_NOTES).then(result, err);
343+
}
345344
};
346345

347346
WidgetItem.openLinks = function (actionItems, $event) {
@@ -360,18 +359,19 @@
360359
};
361360

362361
WidgetItem.getBookmarkedItems = function () {
363-
Buildfire.spinner.show();
364362
var err = function (error) {
365363
Buildfire.spinner.hide();
366-
console.log("============ There is an error in getting data", error);
364+
367365
}, result = function (result) {
368366
Buildfire.spinner.hide();
369367
console.log("===========searchinItem", result);
370368
WidgetItem.bookmarks = result;
371369
WidgetItem.getBookmarks();
372370
};
373-
if (WidgetItem.currentLoggedInUser && WidgetItem.currentLoggedInUser._id)
371+
if (WidgetItem.currentLoggedInUser && WidgetItem.currentLoggedInUser._id) {
372+
Buildfire.spinner.show();
374373
UserData.search({}, TAG_NAMES.SEMINAR_BOOKMARKS).then(result, err);
374+
}
375375
};
376376

377377
WidgetItem.getNoteDetail = function (noteId) {
@@ -387,7 +387,6 @@
387387
};
388388

389389
WidgetItem.addToBookmark = function (itemId, item, isBookmarked) {
390-
Buildfire.spinner.show();
391390
if (isBookmarked && item.bookmarkId) {
392391
var successRemove = function (result) {
393392
Buildfire.spinner.hide();
@@ -411,8 +410,10 @@
411410
return console.error('There was a problem removing your data');
412411
};
413412

414-
if (WidgetItem.currentLoggedInUser && WidgetItem.currentLoggedInUser._id)
413+
if (WidgetItem.currentLoggedInUser && WidgetItem.currentLoggedInUser._id) {
414+
Buildfire.spinner.show();
415415
UserData.delete(item.bookmarkId, TAG_NAMES.SEMINAR_BOOKMARKS, WidgetItem.currentLoggedInUser._id).then(successRemove, errorRemove);
416+
}
416417
} else {
417418
WidgetItem.bookmarkItem = {
418419
data: {
@@ -441,8 +442,10 @@
441442
Buildfire.spinner.hide();
442443
return console.error('There was a problem saving your data');
443444
};
444-
if (WidgetItem.currentLoggedInUser && WidgetItem.currentLoggedInUser._id)
445+
if (WidgetItem.currentLoggedInUser && WidgetItem.currentLoggedInUser._id) {
446+
Buildfire.spinner.show();
445447
UserData.insert(WidgetItem.bookmarkItem.data, TAG_NAMES.SEMINAR_BOOKMARKS).then(successItem, errorItem);
448+
}
446449
}
447450
};
448451

@@ -685,7 +688,7 @@
685688
var oldState=carouselImages;
686689
if(random){
687690
carouselImages=[carouselImages[Math.floor(Math.random() * carouselImages.length)]];
688-
691+
689692
if(carouselImages[0]!=lastImage[0]){
690693
lastImage=carouselImages;
691694
appendOneImage(carouselImages);
@@ -702,11 +705,11 @@
702705
appendOneImage(carouselImages);
703706
});
704707
}
705-
708+
706709
}
707710
function appendOneImage(carouselImages){
708711
var myImg=document.getElementById("one_img_item");
709-
712+
710713
if(myImg==null){
711714
carouselContainer.innerHTML = '';
712715
var img = document.createElement('img');
@@ -742,9 +745,9 @@
742745
if(changeTimer) clearInterval(changeTimer);
743746
if(carouselContainer != null){
744747
if ( WidgetItem.item.data && WidgetItem.item.data.carouselImages && WidgetItem.item.data.carouselImages.length > 0) {
745-
var speed = WidgetItem.item.data.speed ? WidgetItem.item.data.speed : 5000
746-
var order = WidgetItem.item.data.order ? WidgetItem.item.data.order : 0
747-
var display = WidgetItem.item.data.display ? WidgetItem.item.data.display : 0
748+
var speed = WidgetItem.item.data.speed ? WidgetItem.item.data.speed : 5000
749+
var order = WidgetItem.item.data.order ? WidgetItem.item.data.order : 0
750+
var display = WidgetItem.item.data.display ? WidgetItem.item.data.display : 0
748751
var carouselImages = WidgetItem.item.data.carouselImages;
749752
var isHome=(new URLSearchParams(window.location.search).get('fid').split("=")[0]=="launcherPluginv");
750753
var storagePlace=(isHome)?"carouselLastImageHomeItem":"carouselLastImageItem";
@@ -772,12 +775,12 @@
772775
carouselImages=[carouselImages[Math.floor(Math.random() * carouselImages.length)]];
773776
lastImage=carouselImages;
774777
buildfire.localStorage.removeItem(storagePlace);
775-
778+
776779
}else if(order == 1 && display== 0 && carouselImages.length > 1){
777780
randomizeArray(carouselImages);
778781
buildfire.localStorage.removeItem(storagePlace);
779782
}
780-
783+
781784
if (carouselImages.length > 1) {
782785
setTimeout(()=>{
783786
WidgetItem.view = new buildfire.components.carousel.view({
@@ -788,7 +791,7 @@
788791
autoInterval:speed
789792
});
790793
},100)
791-
794+
792795
} else {
793796
appendOneImage(carouselImages);
794797
}
@@ -797,7 +800,7 @@
797800
carouselContainer.classList.add('hide');
798801
}
799802
}
800-
803+
801804
}
802805
}]);
803806
})(window.angular, window.buildfire, window);

0 commit comments

Comments
 (0)