fix(routing): fix JSON output support

azu · Jun 14, 2016 · 7e56864 · 7e56864
1 parent 81fc388
commit 7e56864
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/website/src/component/container/App/App.js b/website/src/component/container/App/App.js
@@ -56,14 +56,14 @@ export default class App extends React.Component {
             <SideEffectLocationHash text={routing.text}/>
             <GithubCorner href="https://github.com/azu/morpheme-match"/>
             <Title className="App-title"><a href="https://github.com/azu/morpheme-match">morpheme-match</a></Title>
-            <h2 class="subtitle">形態素解析したトークンを元に、文章にマッチするトークンが含まれているかをチェックするライブラリのデモ</h2>
+            <h2 className="subtitle">形態素解析したトークンを元に、文章にマッチするトークンが含まれているかをチェックするライブラリのデモ</h2>
             <div className="App-container">
                 <div className="App-InputForm">
                     <InputForm defaultValue={analyzer.currentText} onSubmit={updateAnalyzedText}/>
                 </div>
                 <div className="App-Analyzed">
                     <AnalyzedTable label="解析結果" tokens={analyzer.tokens}/>
-                    <AnalyzedJSONField permanentURL={analyzer.permanentURL}
+                    <AnalyzedJSONField permanentURL={routing.currentURL}
                                        outputJSON={analyzer.outputJSON}/>
                 </div>
                 <div className="App-Test">

diff --git a/website/src/component/project/AnalyzedJSONField/AnalyzedJSONField.js b/website/src/component/project/AnalyzedJSONField/AnalyzedJSONField.js
@@ -7,7 +7,7 @@ export default class AnalyzedJSONField extends React.Component {
         const permanentURL = this.props.permanentURL;
         const value = `// ${permanentURL}
 ${outputJSON}
-`
+`;
         return <div className="AnalyzedJSONField">
             <label className="AnalyzedJSONField-label">解析結果(JSON)</label>
             <p className="control">

diff --git a/website/src/js/store/analyzer/AnalyzerState.js b/website/src/js/store/analyzer/AnalyzerState.js
@@ -39,14 +39,6 @@ export default class AnalyzerState extends ReduceState {
         }
     }
 
-    // return "<value>"
-    get permanentURL() {
-        const origin = window.location.protocol + "//" + window.location.hostname + (window.location.port
-                ? ":" + window.location.port : "");
-        const hash = this.currentText ? `#${this.currentText}` : "";
-        return `${origin}${window.location.pathname}${hash}`;
-    }
-
     get outputJSON() {
         return JSON.stringify(this.tokens, null, 4);
     }

diff --git a/website/src/js/store/routing/RoutingState.js b/website/src/js/store/routing/RoutingState.js
@@ -9,6 +9,13 @@ export default class RoutingState extends ReduceState {
         this.text = queryObject.text;
     }
 
+    get currentURL() {
+        const origin = window.location.protocol + "//" + window.location.hostname + (window.location.port
+                ? ":" + window.location.port : "");
+        const query = this.text ? `?text=${this.text}` : "";
+        return `${origin}${window.location.pathname}${query}`;
+    }
+
     reduce(payload) {
         switch (payload.type) {
             case ChangeURLStateUseCase.Events.change: