diff --git a/assets/css/modal.css b/assets/css/modal.css
index 50f797349..a754ac2e7 100644
--- a/assets/css/modal.css
+++ b/assets/css/modal.css
@@ -35,17 +35,6 @@
overflow-y: auto;
}
-.modal__loader {
- margin: 300px auto 0 auto;
- animation: loaderFadein .4s ease-in;
-}
-
-@keyframes loaderFadein {
- 0% { opacity: 0; }
- 50% { opacity: 0; }
- 100% { opacity: 1; }
-}
-
.modal__container {
background-color: #fff;
padding: 1rem 2rem;
diff --git a/assets/js/dashboard/stats/modals/countries.js b/assets/js/dashboard/stats/modals/countries.js
index f2be08748..f545e23f8 100644
--- a/assets/js/dashboard/stats/modals/countries.js
+++ b/assets/js/dashboard/stats/modals/countries.js
@@ -30,7 +30,11 @@ class CountriesModal extends React.Component {
}
renderBody() {
- if (this.state.countries) {
+ if (this.state.loading) {
+ return (
+
+ )
+ } else if (this.state.countries) {
return (
diff --git a/assets/js/dashboard/stats/modals/google-keywords.js b/assets/js/dashboard/stats/modals/google-keywords.js
index 4cac6ebd6..1672ca374 100644
--- a/assets/js/dashboard/stats/modals/google-keywords.js
+++ b/assets/js/dashboard/stats/modals/google-keywords.js
@@ -93,7 +93,11 @@ class GoogleKeywordsModal extends React.Component {
}
renderBody() {
- if (!this.state.loading) {
+ if (this.state.loading) {
+ return (
+
+ )
+ } else {
return (
diff --git a/assets/js/dashboard/stats/modals/modal.js b/assets/js/dashboard/stats/modals/modal.js
index 58dc80b03..505393e5c 100644
--- a/assets/js/dashboard/stats/modals/modal.js
+++ b/assets/js/dashboard/stats/modals/modal.js
@@ -2,12 +2,6 @@ import React from "react";
import { createPortal } from "react-dom";
import { withRouter } from 'react-router-dom';
-function SlideIn({show, children}) {
- const className = show ? "modal-enter-active" : "modal-enter"
-
- return {children}
-}
-
class Modal extends React.Component {
constructor(props) {
super(props)
@@ -53,15 +47,9 @@ class Modal extends React.Component {
- { !this.props.show &&
-
- }
-
-
-
- {this.props.children}
-
-
+
+ {this.props.children}
+
,
diff --git a/assets/js/dashboard/stats/modals/pages.js b/assets/js/dashboard/stats/modals/pages.js
index aaa4aee50..910811faf 100644
--- a/assets/js/dashboard/stats/modals/pages.js
+++ b/assets/js/dashboard/stats/modals/pages.js
@@ -45,7 +45,11 @@ class PagesModal extends React.Component {
}
renderBody() {
- if (this.state.pages) {
+ if (this.state.loading) {
+ return (
+
+ )
+ } else if (this.state.pages) {
return (
@@ -74,7 +78,7 @@ class PagesModal extends React.Component {
render() {
return (
-
+
{ this.renderBody() }
)
diff --git a/assets/js/dashboard/stats/modals/referrer-drilldown.js b/assets/js/dashboard/stats/modals/referrer-drilldown.js
index 478e6a0aa..1468561ba 100644
--- a/assets/js/dashboard/stats/modals/referrer-drilldown.js
+++ b/assets/js/dashboard/stats/modals/referrer-drilldown.js
@@ -113,7 +113,11 @@ class ReferrerDrilldownModal extends React.Component {
}
renderBody() {
- if (this.state.referrers) {
+ if (this.state.loading) {
+ return (
+
+ )
+ } else if (this.state.referrers) {
return (
diff --git a/assets/js/dashboard/stats/modals/referrers.js b/assets/js/dashboard/stats/modals/referrers.js
index 053fa8792..8632ac767 100644
--- a/assets/js/dashboard/stats/modals/referrers.js
+++ b/assets/js/dashboard/stats/modals/referrers.js
@@ -54,7 +54,11 @@ class ReferrersModal extends React.Component {
}
renderBody() {
- if (this.state.referrers) {
+ if (this.state.loading) {
+ return (
+
+ )
+ } else if (this.state.referrers) {
return (
@@ -83,7 +87,7 @@ class ReferrersModal extends React.Component {
render() {
return (
-
+
{ this.renderBody() }
)