mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #1656 from dmitrylyzo/fix-plugin-install

Browse source 
Fix CircleOfDeath on plugin install

(cherry picked from commit 89e584686e)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
dkanada 2020-07-28 12:36:33 +09:00 • committed by Joshua M. Boniface
parent c2d9ca2af9
commit ec9ab39d26
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/controllers/dashboard/plugins/add.js
View file

@ -66,7 +66,7 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'connectionManager', 'e
} }
function alertText(options) { function alertText(options) {
require(['alert'], function (alert) { require(['alert'], function ({default: alert}) {
alert(options); alert(options);
}); });
} }
@ -114,14 +114,12 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'connectionManager', 'e
})[0]; })[0];
var version = $('#selectVersion', page).val(); var version = $('#selectVersion', page).val();
if (installedPlugin) { if (installedPlugin && installedPlugin.Version === version) {
if (installedPlugin.Version === version) { loading.hide();
loading.hide(); Dashboard.alert({
Dashboard.alert({ message: globalize.translate('MessageAlreadyInstalled'),
message: globalize.translate('MessageAlreadyInstalled'), title: globalize.translate('HeaderPluginInstallation')
title: globalize.translate('HeaderPluginInstallation') });
});
}
} else { } else {
performInstallation(page, name, guid, version); performInstallation(page, name, guid, version);
} }