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

Fix CircleOfDeath on plugin install
This commit is contained in:
dkanada
2020-07-28 12:36:33 +09:00
committed by GitHub

View File

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