diff --git a/src/scripts/selectserver.js b/src/scripts/selectserver.js index 7b0039c584..8f0bf59759 100644 --- a/src/scripts/selectserver.js +++ b/src/scripts/selectserver.js @@ -47,6 +47,7 @@ define(["loading", "appRouter", "layoutManager", "appSettings", "apphost", "focu function showServerConnectionFailure() { alertText(globalize.translate("MessageUnableToConnectToServer"), globalize.translate("HeaderConnectionFailure")) } + return function(view, params) { function connectToServer(server) { loading.show(), connectionManager.connectToServer(server, { @@ -81,62 +82,6 @@ define(["loading", "appRouter", "layoutManager", "appSettings", "apphost", "focu }) } - function acceptInvitation(id) { - loading.show(), connectionManager.acceptServer(id).then(function() { - loading.hide(), loadServers(), loadInvitations() - }, showGeneralError) - } - - function rejectInvitation(id) { - loading.show(), connectionManager.rejectServer(id).then(function() { - loading.hide(), loadServers(), loadInvitations() - }, showGeneralError) - } - - function showPendingInviteMenu(elem) { - var card = dom.parentWithClass(elem, "inviteItem"), - invitationId = card.getAttribute("data-id"), - menuItems = []; - menuItems.push({ - name: globalize.translate("sharedcomponents#Accept"), - id: "accept" - }), menuItems.push({ - name: globalize.translate("sharedcomponents#Reject"), - id: "reject" - }), require(["actionsheet"], function(actionsheet) { - actionsheet.show({ - items: menuItems, - positionTo: elem, - callback: function(id) { - switch (id) { - case "accept": - acceptInvitation(invitationId); - break; - case "reject": - rejectInvitation(invitationId) - } - } - }) - }) - } - - function getPendingInviteHtml(item) { - var cardBoxCssClass = "cardBox"; - layoutManager.tv && (cardBoxCssClass += " cardBox-focustransform"); - var innerOpening = '
'; - return '
" - } - - function renderInvitations(list) { - list.length ? view.querySelector(".invitationSection").classList.remove("hide") : view.querySelector(".invitationSection").classList.add("hide"); - var html = list.map(getPendingInviteHtml).join(""); - view.querySelector(".invitations").innerHTML = html - } - - function loadInvitations() { - connectionManager.isLoggedIntoConnect() ? connectionManager.getUserInvitations().then(renderInvitations) : renderInvitations([]) - } - function onServerClick(server) { var menuItems = []; menuItems.push({ @@ -175,7 +120,9 @@ define(["loading", "appRouter", "layoutManager", "appSettings", "apphost", "focu var backdropUrl = staticBackdrops.getRandomImageUrl(); view.addEventListener("viewshow", function(e) { var isRestored = e.detail.isRestored; - appRouter.setTitle(null), backdrop.setBackdrop(backdropUrl), isRestored || (loadServers(), loadInvitations()) + appRouter.setTitle(null); + backdrop.setBackdrop(backdropUrl); + isRestored || loadServers(); }), view.querySelector(".servers").addEventListener("click", function(e) { var card = dom.parentWithClass(e.target, "card"); if (card) { @@ -188,9 +135,6 @@ define(["loading", "appRouter", "layoutManager", "appSettings", "apphost", "focu })[0]) } } - }), view.querySelector(".invitations").addEventListener("click", function(e) { - var btnInviteMenu = dom.parentWithClass(e.target, "btnInviteMenu"); - btnInviteMenu && showPendingInviteMenu(btnInviteMenu) }) } }); diff --git a/src/selectserver.html b/src/selectserver.html index 564aadc565..4a1834a9b9 100644 --- a/src/selectserver.html +++ b/src/selectserver.html @@ -7,19 +7,9 @@
-
${ButtonAddServer}
- -
-
-

${Invitations}

-
-
-
-
-
\ No newline at end of file