Skip to content

Internal deeplinking #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nteske merged 3 commits into from
Jan 12, 2022
Merged

Internal deeplinking #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98ea2e7
finish internal deeplinking
Jan 5, 2022
a8c656e
made some enhancements
Jan 5, 2022
af1608e
fix bug: carousel not working with internal deeplinking
Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions control/content/controllers/content.home.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
buildfire.analytics.unregisterEvent(`DOCUMENT_${item.id}_OPENED`);
DataStore.deleteById(item.id, TAG_NAMES.SEMINAR_ITEMS).then(function (result) {
ContentHome.items.splice(_index, 1);
var searchOptionUserData = {};
searchOptionUserData.filter ={"$or": [{"$json.itemID": {"$eq": item.id}}]};
var success = function(data) {
for (var note = 0; note < data.length; note++) {
Expand Down
4 changes: 2 additions & 2 deletions control/content/controllers/content.item.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
ContentItem.item.data.deepLinkUrl = Buildfire.deeplink.createLink({ id: result.id });
}
updateMasterItem(ContentItem.item);
}, errorItem = function () {
}, errorItem = function (err) {
Buildfire.spinner.hide();
throw console.error('There was a problem fetching your data', err);
};
Expand Down Expand Up @@ -312,7 +312,7 @@
} else if (!ContentItem.isNewItemInserted) {
ContentItem.addNewItem();
}
}, 300);
}, 500);
}
};

Expand Down
12 changes: 9 additions & 3 deletions widget/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
buildfire.history.push(currentView, { showItemInTitlebar: true })

var newScope = $rootScope.$new();
var _newView = '<div id="' + view.template + '" ><div class="slide content" data-back-img="{{itemDetailbackgroundImage}}" ng-include="\'templates/' + view.template + '.html\'"></div></div>';
var _newView = '<div id="' + view.template + '" class="singleItem" ><div class="slide content" data-back-img="{{itemDetailbackgroundImage}}" ng-include="\'templates/' + view.template + '.html\'"></div></div>';
var parTpl = $compile(_newView)(newScope);

$(elem).append(parTpl);
views++;

} else if (type === 'POP') {

var _elToRemove = $(elem).find('#' + view.template),
var _elToRemove = $('.singleItem').last(),
_child = _elToRemove.children("div").eq(0);

_child.addClass("ng-leave ng-leave-active");
Expand Down Expand Up @@ -158,11 +158,17 @@
.run(['ViewStack', '$rootScope', function (ViewStack, $rootScope) {
buildfire.navigation.onBackButtonClick = function () {
if (ViewStack.hasViews()) {
if (ViewStack.getCurrentView().template == 'Item') {
if (ViewStack.getPreviousView().params && ViewStack.getPreviousView().params.itemId) {
buildfire.messaging.sendMessageToControl({
id: ViewStack.getPreviousView().params.itemId,
type: 'OpenItem'
});
} else {
buildfire.messaging.sendMessageToControl({
type: 'BackToHome'
});
}
buildfire.history.pop();
ViewStack.pop();
} else {
buildfire.navigation._goBackOne();
Expand Down
15 changes: 3 additions & 12 deletions widget/app.services.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,24 +245,16 @@
}])
.factory('ViewStack', ['$rootScope', function ($rootScope) {
var views = [];
var viewMap = {};
return {
push: function (view) {
console.log(">>>>>>>>>>>>", view, viewMap);
if (viewMap[view.template]) {
this.pop();
}
else {
viewMap[view.template] = 1;
views.push(view);
$rootScope.$broadcast('VIEW_CHANGED', 'PUSH', view);
}
console.log(">>>>>>>>>>>>", view);
views.push(view);
$rootScope.$broadcast('VIEW_CHANGED', 'PUSH', view);
return view;
},
pop: function () {
$rootScope.$broadcast('BEFORE_POP', views[views.length - 1]);
var view = views.pop();
delete viewMap[view.template];
$rootScope.$broadcast('VIEW_CHANGED', 'POP', view);
return view;
},
Expand All @@ -275,7 +267,6 @@
popAllViews: function (noAnimation) {
$rootScope.$broadcast('VIEW_CHANGED', 'POPALL', views,noAnimation);
views = [];
viewMap = {};
},
getPreviousView: function () {
return views.length && views[views.length - 2] || {};
Expand Down
26 changes: 26 additions & 0 deletions widget/controllers/widget.home.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,31 @@
}
);

buildfire.deeplink.onUpdate((deeplinkData) => {
var notFound = function(){
var text = WidgetHome.languages.deeplinkNoteNotFound ? WidgetHome.languages.deeplinkNoteNotFound:'Item does not exist!';
buildfire.dialog.toast({
message: text
});
}
var errorAll = function (err) {
notFound();
};
var successAll = function (result) {
if (!result || !result.data || !result.data.title) notFound();
else {
buildfire.analytics.trackAction(`DOCUMENT_${result.id}_OPENED`);
ViewStack.push({
template: 'Item',
params: {
controller: "WidgetItemCtrl as WidgetItem",
itemId: result.id
}
});
}
};
DataStore.getById(deeplinkData.id, TAG_NAMES.SEMINAR_ITEMS).then(successAll, errorAll);
});
//Refresh list of items on pulling the tile bar

buildfire.datastore.onRefresh(function () {
Expand Down Expand Up @@ -533,6 +558,7 @@
Buildfire.spinner.hide();
WidgetHome.busy = false;
WidgetHome.seminarItemsInitialFetch = true;
if (!resultAll.result) resultAll.result = [];
WidgetHome.items = WidgetHome.items.length != 0 ? WidgetHome.items.concat(resultAll.result) : resultAll.result;
var released = WidgetHome.items.filter(result => {
return !result.data.releaseDate || result.data.releaseDate < Date.now();
Expand Down
5 changes: 3 additions & 2 deletions widget/controllers/widget.item.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,12 +296,12 @@
/**
* This event listener is bound for "Carousel:LOADED" event broadcast
*/
$rootScope.$on("Carousel2:LOADED", function () {
let carouselListener = $rootScope.$on("Carousel2:LOADED", function () {
// WidgetItem.view = null;
if (WidgetItem.view)
WidgetItem.view._destroySlider();
if (!WidgetItem.view) {
WidgetItem.view = new Buildfire.components.carousel.view("#carousel2", []);
WidgetItem.view = new Buildfire.components.carousel.view(".carousel2", []);
}
if (WidgetItem.item.data && WidgetItem.item.data.carouselImages) {
WidgetItem.view.loadItems(WidgetItem.item.data.carouselImages);
Expand Down Expand Up @@ -652,6 +652,7 @@
});

WidgetItem.listeners['CHANGED'] = $rootScope.$on('VIEW_CHANGED', function (e, type, view) {
carouselListener();
if (type === 'POP') {
DataStore.onUpdate().then(null, null, onUpdateCallback);
}
Expand Down
2 changes: 1 addition & 1 deletion widget/templates/Item.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!--<div class="plugin-slide">-->
<!--<img src="../../../styles/media/holder-16x9.png">-->
<!--</div>-->
<div id="carousel2" ng-if="WidgetItem.item.data.carouselImages.length" build-fire-carousel2=""
<div class="carousel2" ng-if="WidgetItem.item.data.carouselImages.length" build-fire-carousel2=""
ng-style="WidgetItem.item.data.carouselImages.length > 0 ? {'min-height': (9 * deviceWidth / 16) + 'px' } : {}">
</div>

Expand Down
2 changes: 1 addition & 1 deletion widget/templates/Item_List_1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{{WidgetHome.languages.noItems}}
<img style="margin-top: 35px;" src="./images/empty_page.svg"/>
</p>
<div class="list-item" ng-repeat="item in WidgetHome.released" ng-if="isFetchedAllData" ng-class="shouldLockItem(item.data.rank)" id="{{ 'seminarItem' + item.data.rank }}">
<div class="list-item" ng-repeat="item in WidgetHome.released" ng-if="isFetchedAllData && !item.data['__$Deleted']" ng-class="shouldLockItem(item.data.rank)" id="{{ 'seminarItem' + item.data.rank }}">
<div class="item-click-holder ellipsis" ng-click="WidgetHome.openDetails(item.id, item.data.rank, $index)">
<div class="square-icon list-media-holder" ng-if="item.data.listImage || (!item.data.listImage && shouldLockItem(item.data.rank) === 'locked')">
<img ng-if="item.data.listImage" class="border-radius-three" load-image="1x1" crop-width="60" crop-height="60"
Expand Down
2 changes: 1 addition & 1 deletion widget/templates/Item_List_2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{{WidgetHome.languages.noItems}}
<img style="margin-top: 35px;" src="./images/empty_page.svg"/>
</p>
<div class="list-item" ng-repeat="item in WidgetHome.released" ng-if="isFetchedAllData" ng-class="shouldLockItem(item.data.rank)" id="{{ 'seminarItem' + item.data.rank }}">
<div class="list-item" ng-repeat="item in WidgetHome.released" ng-if="isFetchedAllData && !item.data['__$Deleted']" ng-class="shouldLockItem(item.data.rank)" id="{{ 'seminarItem' + item.data.rank }}">
<div class="item-click-holder ellipsis" ng-click="WidgetHome.openDetails(item.id, item.data.rank, $index)">
<div class="list-media-holder" ng-if="item.data.listImage || (!item.data.listImage && shouldLockItem(item.data.rank) === 'locked')">
<img ng-if="item.data.listImage" class="border-radius-three" load-image="16x9" crop-width="120" crop-height="70"
Expand Down
2 changes: 1 addition & 1 deletion widget/templates/Item_List_3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
{{WidgetHome.languages.noItems}}
<img style="margin-top: 35px;" src="./images/empty_page.svg"/>
</p>
<div class="list-item" ng-repeat="item in WidgetHome.released" ng-if="isFetchedAllData" ng-class="shouldLockItem(item.data.rank)" id="{{ 'seminarItem' + item.data.rank }}">
<div class="list-item" ng-repeat="item in WidgetHome.released" ng-if="isFetchedAllData && !item.data['__$Deleted']" ng-class="shouldLockItem(item.data.rank)" id="{{ 'seminarItem' + item.data.rank }}">
<div class="item-click-holder ellipsis" ng-click="WidgetHome.openDetails(item.id, item.data.rank, $index)">
<div class="square-icon list-media-holder pull-left overflow-hidden" ng-if="item.data.listImage || (!item.data.listImage && shouldLockItem(item.data.rank) === 'locked')">
<img ng-if="item.data.listImage" class="border-radius-three" load-image="1x1" crop-width="60" crop-height="60"
Expand Down
2 changes: 1 addition & 1 deletion widget/templates/Item_List_4.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</p>

<div class="plugin-banner hasBackground">
<div class="plugin-slide" ng-repeat="item in WidgetHome.released" ng-if="isFetchedAllData" ng-class="shouldLockItem(item.data.rank)" id="{{ 'seminarItem' + item.data.rank }}">
<div class="plugin-slide" ng-repeat="item in WidgetHome.released" ng-if="isFetchedAllData && !item.data['__$Deleted']" ng-class="shouldLockItem(item.data.rank)" id="{{ 'seminarItem' + item.data.rank }}">
<img ng-hide="item.data.listImage" src="../../../styles/media/holder-16x9.png" style="opacity: 0;">
<img ng-show="item.data.listImage" class="border-radius-three" ng-if="item.data.listImage"
load-image="16x9" crop-width="{{deviceWidth}}" crop-height="183" crop-type="crop"
Expand Down
2 changes: 1 addition & 1 deletion widget/templates/Item_List_5.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</p>
<div class="notes items-grid">
<div class="plugin-banner overflow-hidden grid-item" ng-repeat="item in WidgetHome.released"
ng-if="isFetchedAllData" ng-class="shouldLockItem(item.data.rank)" id="{{ 'seminarItem' + item.data.rank }}">
ng-if="isFetchedAllData && !item.data['__$Deleted']" ng-class="shouldLockItem(item.data.rank)" id="{{ 'seminarItem' + item.data.rank }}">
<div class="plugin-slide">
<img ng-hide="item.data.listImage" src="../../../styles/media/holder-1x1.png" style="opacity: 0;">
<img ng-show="item.data.listImage" ng-if="item.data.listImage" load-image="1x1" crop-width="162"
Expand Down