Fix share PGN in analysis offline

lichess-org · Oct 16, 2016 · f3aa365 · f3aa365
1 parent 74508b6
commit f3aa365
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 37 deletions.
diff --git a/project/src/js/ui/analyse/AnalyseCtrl.ts b/project/src/js/ui/analyse/AnalyseCtrl.ts
@@ -14,7 +14,6 @@ import { notesCtrl } from '../shared/round/notes';
 import { getPGN } from '../shared/round/roundXhr';
 import importPgnPopup from './importPgnPopup';
 import * as util from './util';
-import { renderStepsTxt } from './pgnExport';
 import cevalCtrl from './ceval/cevalCtrl';
 import crazyValid from './crazy/crazyValid';
 import explorerCtrl from './explorer/explorerCtrl';
@@ -335,7 +334,8 @@ export default class AnalyseCtrl {
       fen: situation.fen,
       uci: situation.uciMoves[0],
       san: situation.pgnMoves[0],
-      crazy: situation.crazyhouse
+      crazy: situation.crazyhouse,
+      pgnMoves: this.vm.step.pgnMoves ? this.vm.step.pgnMoves.concat(situation.pgnMoves) : undefined
     };
     const newPath = this.analyse.addStep(step, treePath.read(path));
     this.jump(newPath);
@@ -428,7 +428,7 @@ export default class AnalyseCtrl {
       getPGN(this.data.game.id)
       .then(pgn => window.plugins.socialsharing.share(pgn))
       .catch(handleXhrError);
-    } else if (this.source === 'offline') {
+    } else {
       const endSituation = this.data.steps[this.data.steps.length - 1];
       chess.pgnDump({
         variant: this.data.game.variant.key,
@@ -437,8 +437,6 @@ export default class AnalyseCtrl {
       })
       .then((res: chess.PgnDumpResponse) => window.plugins.socialsharing.share(res.pgn))
       .catch(console.error.bind(console));
-    } else {
-      window.plugins.socialsharing.share(renderStepsTxt(this.analyse.getSteps(this.vm.path)));
     }
   }
 

diff --git a/project/src/js/ui/analyse/data.ts b/project/src/js/ui/analyse/data.ts
@@ -42,7 +42,8 @@ export function makeDefaultData(fen: string): AnalysisData {
         ply,
         san: null,
         uci: null,
-        check: false
+        check: false,
+        pgnMoves: []
       }
     ]
   };

diff --git a/project/src/js/ui/analyse/interfaces.ts b/project/src/js/ui/analyse/interfaces.ts
@@ -6,7 +6,7 @@ export interface SanToRole {
   [san: string]: Role
 }
 
-export type Source = 'online' | 'offline' | 'fen';
+export type Source = 'online' | 'offline';
 
 export interface PathObj {
   ply: number

diff --git a/project/src/js/ui/analyse/pgnExport.js b/project/src/js/ui/analyse/pgnExport.js
diff --git a/project/src/js/utils/offlineGames.ts b/project/src/js/utils/offlineGames.ts
@@ -8,9 +8,10 @@ export function getCurrentOTBGame() {
   return storage.get(otbStorageKey);
 }
 
-export function getAnalyseData(data: StoredOfflineGame) {
+export function getAnalyseData(data: StoredOfflineGame): AnalysisData {
   if (!data) return null;
-  data.data.steps = data.situations.map((o: GameSituation) => {
+  const aData = <AnalysisData>data.data;
+  aData.steps = data.situations.map((o: GameSituation) => {
     const step: AnalysisStep = {
       fen: o.fen,
       ply: o.ply,
@@ -25,7 +26,7 @@ export function getAnalyseData(data: StoredOfflineGame) {
     };
     return step;
   });
-  return data.data;
+  return aData;
 }
 
 export function setCurrentOTBGame(game: StoredOfflineGame): void {