yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-28 01:40:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:strapi/strapi into fix/deploy

Browse Source
This commit is contained in:
Aurelsicoko 2018-01-16 16:02:02 +01:00
commit adb11a0b8b
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/strapi-admin/admin/src/components/PluginCard/index.js
View File

@ -63,8 +63,8 @@ class PluginCard extends React.Component {
} }
} }
handleDownloadPlugin = () => { handleDownloadPlugin = (e) => {
this.props.downloadPlugin(); this.props.downloadPlugin(e);
} }
shouldOpenModal = (props) => { shouldOpenModal = (props) => {

8
packages/strapi-admin/admin/src/containers/InstallPluginPage/saga.js
View File

@ -34,11 +34,15 @@ export function* pluginDownload() {
const response = yield call(request, '/admin/plugins/install', opts, true); const response = yield call(request, '/admin/plugins/install', opts, true);
if (response.ok) { if (response.ok) {
yield put(downloadPluginSucceeded());
yield new Promise(resolve => {
setTimeout(() => { setTimeout(() => {
resolve();
}, 8000);
});
yield put(downloadPluginSucceeded());
window.location.reload(); window.location.reload();
}, 500);
} }
} catch(err) { } catch(err) {
yield put(downloadPluginError()); yield put(downloadPluginError());

2
packages/strapi-helper-plugin/lib/internals/webpack/manifest.json
View File

File diff suppressed because one or more lines are too long