milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use connectionManager global

Browse source
This commit is contained in:
MrTimscampi 2020-08-30 06:06:47 +02:00
parent 4d540bf9ca
commit c97d7a6f59
79 changed files with 233 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/scripts/libraryMenu.js
View file

@ -1,7 +1,6 @@
import dom from 'dom';
import layoutManager from 'layoutManager';
import inputManager from 'inputManager';
import connectionManager from 'connectionManager';
import events from 'events';
import viewManager from 'viewManager';
import appRouter from 'appRouter';
@ -57,10 +56,10 @@ import 'flexStyles';
function getCurrentApiClient() {
if (currentUser && currentUser.localUser) {
return connectionManager.getApiClient(currentUser.localUser.ServerId);
return window.connectionManager.getApiClient(currentUser.localUser.ServerId);
}
return connectionManager.currentApiClient();
return window.connectionManager.currentApiClient();
}
function lazyLoadViewMenuBarImages() {
@ -749,7 +748,7 @@ import 'flexStyles';
}
if (requiresUserRefresh) {
connectionManager.user(getCurrentApiClient()).then(updateUserInHeader);
window.connectionManager.user(getCurrentApiClient()).then(updateUserInHeader);
}
}
@ -791,7 +790,7 @@ import 'flexStyles';
if (user) {
Promise.resolve(user);
} else {
connectionManager.user(getCurrentApiClient()).then(function (user) {
window.connectionManager.user(getCurrentApiClient()).then(function (user) {
refreshLibraryInfoInDrawer(user);
updateLibraryMenu(user.localUser);
});
@ -957,8 +956,8 @@ import 'flexStyles';
renderHeader();
events.on(connectionManager, 'localusersignedin', function (e, user) {
const currentApiClient = connectionManager.getApiClient(user.ServerId);
events.on(window.connectionManager, 'localusersignedin', function (e, user) {
const currentApiClient = window.connectionManager.getApiClient(user.ServerId);
currentDrawerType = null;
currentUser = {
@ -967,13 +966,13 @@ import 'flexStyles';
loadNavDrawer();
connectionManager.user(currentApiClient).then(function (user) {
window.connectionManager.user(currentApiClient).then(function (user) {
currentUser = user;
updateUserInHeader(user);
});
});
events.on(connectionManager, 'localusersignedout', function () {
events.on(window.connectionManager, 'localusersignedout', function () {
currentUser = {};
updateUserInHeader();
});