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

fix startup wizard redirect and standalone mode

Browse source
This commit is contained in:
dkanada 2020-09-10 23:20:55 +09:00
parent e06b9ec4d0
commit cb1d2887fa
8 changed files with 78 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/scripts/site.js
View file

@ -63,7 +63,7 @@ function initClient() {
if (!localApiClient) {
var server = window.connectionManager.getLastUsedServer();
if (server) {
if (server && server.Id) {
localApiClient = window.connectionManager.getApiClient(server.Id);
}
}
@ -83,40 +83,38 @@ function initClient() {
}
function createConnectionManager() {
return require(['connectionManagerFactory', 'apphost', 'credentialprovider', 'events', 'userSettings'], function (ConnectionManager, appHost, credentialProvider, events, userSettings) {
return require(['connectionManagerFactory', 'apphost', 'credentialprovider', 'events', 'userSettings', 'apiclient', 'clientUtils'], function (ConnectionManager, appHost, credentialProvider, events, userSettings, apiClientFactory, clientUtils) {
appHost = appHost.default || appHost;
var credentialProviderInstance = new credentialProvider();
var promises = [appHost.init()];
return Promise.all(promises).then(function (responses) {
return Promise.all(promises).then(responses => {
var capabilities = Dashboard.capabilities(appHost);
window.connectionManager = new ConnectionManager(credentialProviderInstance, appHost.appName(), appHost.appVersion(), appHost.deviceName(), appHost.deviceId(), capabilities);
bindConnectionManagerEvents(window.connectionManager, events, userSettings);
clientUtils.serverAddress().then(server => {
if (!server) {
Dashboard.navigate('selectserver.html');
return;
}
if (!AppInfo.isNativeApp) {
console.debug('loading ApiClient singleton');
console.debug('creating apiclient singleton');
let parts = server.split('/');
let url = parts[0] + '//' + parts[2];
var apiClient = new apiClientFactory(url, appHost.appName(), appHost.appVersion(), appHost.deviceName(), appHost.deviceId());
return require(['apiclient', 'clientUtils'], function (apiClientFactory, clientUtils) {
console.debug('creating ApiClient singleton');
apiClient.enableAutomaticNetworking = false;
apiClient.manualAddressOnly = true;
var apiClient = new apiClientFactory(Dashboard.serverAddress(), appHost.appName(), appHost.appVersion(), appHost.deviceName(), appHost.deviceId());
window.connectionManager.addApiClient(apiClient);
window.ApiClient = apiClient;
console.debug('loaded apiclient singleton');
apiClient.enableAutomaticNetworking = false;
apiClient.manualAddressOnly = true;
window.connectionManager.addApiClient(apiClient);
window.ApiClient = apiClient;
localApiClient = apiClient;
console.debug('loaded ApiClient singleton');
});
}
return Promise.resolve();
return Promise.resolve();
});
});
});
}
@ -434,10 +432,6 @@ function initClient() {
define('castSenderApiLoader', [componentsPath + '/castSenderApi'], returnFirstDependency);
if (window.appMode === 'cordova' || window.appMode === 'android' || window.appMode === 'standalone') {
AppInfo.isNativeApp = true;
}
init();
}