@@ -252,8 +261,9 @@ export class IllustContainerWithoutStore extends React.Component {
{`${moment(this.item.created_time).format('LLL')}(JST)`}
- this.props.dispatch(IllustActions.fetchComments(this.illustId))}
+ this.props.dispatch(IllustActions.fetchComments(this.illustId))
+ }
isLoading={this.props.illust.isFetchingComments}
hasMore={!this.props.illust.isCommentsEnd}>
);
diff --git a/src/containers/index.js b/src/containers/index.js
deleted file mode 100644
index 2d44b3c..0000000
--- a/src/containers/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export AppContainer from '@/containers/AppContainer';
-export GalleryContainer, {
- GalleryContainerWithoutStore
-} from '@/containers/GalleryContainer';
-export IllustContainer, {
- IllustContainerWithoutStore
-} from '@/containers/IllustContainer';
-export LoginContainer from '@/containers/LoginContainer';
-export NotFoundContainer from '@/containers/NotFoundContainer';
-export RedirectContainer from '@/containers/RedirectContainer';
diff --git a/src/icons/convert.sh b/src/icons/convert.sh
old mode 100755
new mode 100644
diff --git a/src/index.ejs b/src/index.ejs
index 2f068b0..f7a059a 100644
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -1,5 +1,5 @@
-
+
diff --git a/src/index.js b/src/index.js
index 88a0ff3..35408a8 100644
--- a/src/index.js
+++ b/src/index.js
@@ -6,15 +6,22 @@ import { Provider } from 'react-redux';
import { configureStore } from '@/stores';
import AppContainer from '@/containers/AppContainer';
+import ConnectedIntlProvider from '@/components/ConnectedIntlProvider';
+import chooseLocale from '@/locale/chooseLocale';
+
const store = configureStore();
+chooseLocale(navigator.language, store.dispatch);
+
// Render the main component into the dom
const render = Component => {
ReactDOM.render(
- {`${this.item.width}x${this.item
- .height}`}
+ {`${this.item.width}x${
+ this.item.height
+ }`}
{Array.isArray(this.item.tools) && (
- {this.props.illust.comments.length === 0 ? (
-
+
);
} catch (e) {
- return コメントはありません
- ) : ( -コメント
- )} +
+
-
{this.props.illust.comments.map(elem => {
return
`;
+ replaceStr += `
`;
}
}
return replaceStr === '' ? match : replaceStr;
diff --git a/src/utils/Piwik.js b/src/utils/Piwik.js
index f18893a..1898afa 100644
--- a/src/utils/Piwik.js
+++ b/src/utils/Piwik.js
@@ -109,7 +109,7 @@ export default class Piwik {
}
connectToHistory(history) {
- this.unlistenFromHistory = history.listen(function(loc) {
+ this.unlistenFromHistory = history.listen(loc => {
this.track(loc);
});
diff --git a/src/utils/cachedFetch.js b/src/utils/cachedFetch.js
index 3333e15..68a9400 100644
--- a/src/utils/cachedFetch.js
+++ b/src/utils/cachedFetch.js
@@ -1,5 +1,7 @@
// modify from https://www.sitepoint.com/cache-fetched-ajax-requests/
-import { hashStr, moment, Storage } from '@/utils';
+import hashStr from '@/utils/hashStr';
+import moment from '@/utils/moment';
+import Storage from '@/utils/Storage';
function buildURL(url, params) {
if (!params) {
diff --git a/src/utils/getImagesFromZip.js b/src/utils/getImagesFromZip.js
index c8a46bd..93d0957 100644
--- a/src/utils/getImagesFromZip.js
+++ b/src/utils/getImagesFromZip.js
@@ -1,5 +1,5 @@
import JSZip from 'jszip';
-import { cachedFetch } from '@/utils';
+import cachedFetch from '@/utils/cachedFetch';
export default function getImagesFromZip(zipURL) {
return new Promise(resolve => {
diff --git a/src/utils/index.js b/src/utils/index.js
deleted file mode 100644
index acc6e16..0000000
--- a/src/utils/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export cachedFetch from '@/utils/cachedFetch';
-export hashStr from '@/utils/hashStr';
-export EmojiParser from '@/utils/EmojiParser';
-export getImagesFromZip from '@/utils/getImagesFromZip';
-export moment from '@/utils/moment';
-export Piwik from '@/utils/Piwik';
-export scrollTo from '@/utils/scrollTo';
-export Storage from '@/utils/Storage';
diff --git a/src/utils/withRef.js b/src/utils/withRef.js
new file mode 100644
index 0000000..db37799
--- /dev/null
+++ b/src/utils/withRef.js
@@ -0,0 +1,75 @@
+import React from 'react';
+import shortid from 'shortid';
+
+export function refComponentHoc(ChildComponent, refer) {
+ return class RefComponent extends React.Component {
+ constructor(props) {
+ super(props);
+ }
+
+ @autobind
+ setRef(childComponentInstance) {
+ if (refer) {
+ refer.ref = childComponentInstance;
+ }
+ this[ChildComponent.name] = childComponentInstance;
+ }
+
+ render() {
+ const props = { ...this.props, ref: this.setRef };
+ return