@seafile/sdoc-editor 0.1.154-beta4 → 0.1.154-beta6

package/dist/api/seafile-api.js

@@ -62,9 +62,9 @@ var SeafileAPI = /*#__PURE__*/function () {
       return this._sendPostRequest(url, form);
     }
   }, {
-    key: "getSeadocOriginFileContentDownloadLink",
-    value: function getSeadocOriginFileContentDownloadLink(docUuid) {
-      var url = '/api/v2.1/seadoc/revision/origin-file-download-link/' + docUuid + '/';
+    key: "getSeadocOriginFileContent",
+    value: function getSeadocOriginFileContent(docUuid) {
+      var url = '/api/v2.1/seadoc/revision/origin-file-content/' + docUuid + '/';
       return this.req.get(url);
     }
   }, {

package/dist/context.js

@@ -168,10 +168,10 @@ var Context = /*#__PURE__*/function () {
       return this.api.startRevise(repoID, fileUuid, filePath);
     }
   }, {
-    key: "getSeadocOriginFileContentDownloadLink",
-    value: function getSeadocOriginFileContentDownloadLink() {
+    key: "getSeadocOriginFileContent",
+    value: function getSeadocOriginFileContent() {
       var docUuid = this.getSetting('docUuid');
-      return this.api.getSeadocOriginFileContentDownloadLink(docUuid);
+      return this.api.getSeadocOriginFileContent(docUuid);
     }
   }, {
     key: "getSdocRevisionsCount",

package/dist/pages/simple-editor.js

@@ -114,7 +114,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
     var unsubscribeMergeDocumentError = eventBus.subscribe(EXTERNAL_EVENT.DOCUMENT_REPLACED_ERROR, onError);
     var unsubscribePublishDocumentError = eventBus.subscribe(EXTERNAL_EVENT.PUBLISH_DOCUMENT_ERROR, onError);
     var unsubscribeRemoveDocument = eventBus.subscribe(EXTERNAL_EVENT.REMOVE_DOCUMENT, onDocumentRemoved);
-    var unsubscribeRemoveDocumentError = eventBus.subscribe(EXTERNAL_EVENT.REMOVE_DOCUMENT, onError);
+    var unsubscribeRemoveDocumentError = eventBus.subscribe(EXTERNAL_EVENT.REMOVE_DOCUMENT_ERROR, onError);
     return function () {
       unsubscribeMergeDocument();
       unsubscribePublishDocument();
@@ -153,12 +153,9 @@ var SimpleEditor = function SimpleEditor(_ref) {
     });
   }, []);
   var setDiffContent = useCallback(function () {
-    context.getSeadocOriginFileContentDownloadLink().then(function (res) {
-      var originFileDownloadLink = res.data.download_link;
-      return fetch(originFileDownloadLink);
-    }).then(function (res) {
-      return res.json();
-    }).then(function (originContent) {
+    context.getSeadocOriginFileContent().then(function (res) {
+      var originContentString = res.data.content;
+      var originContent = JSON.parse(originContentString);
       editorRef.current.setDiffContent(originContent);
       editorRef.current.setLoading(false);
     }).catch(function (error) {
@@ -210,14 +207,10 @@ var SimpleEditor = function SimpleEditor(_ref) {
             context.getRevisionBasicVersionContent().then(function (res) {
               var basicVersionContentString = res.data.content; // commit content
               basicContent = JSON.parse(basicVersionContentString);
-              return context.getSeadocOriginFileContentDownloadLink();
+              return context.getSeadocOriginFileContent();
             }).then(function (res) {
-              var originFileDownloadLink = res.data.download_link;
-              return fetch(originFileDownloadLink);
-            }).then(function (res) {
-              return res.json();
-            }).then(function (content) {
-              masterContent = content;
+              var masterContentString = res.data.content;
+              masterContent = JSON.parse(masterContentString);
               var _getRebase = getRebase(masterContent, basicContent, revisionContent),
                 canMerge = _getRebase.canMerge,
                 isNeedReplaceMaster = _getRebase.isNeedReplaceMaster,
@@ -275,7 +268,6 @@ var SimpleEditor = function SimpleEditor(_ref) {
         var originFileURL = context.getSetting('originFileURL');
         jumpToURL(originFileURL);
       }).catch(function (error) {
-        console.log(error);
         toaster.danger(t('Error'));
       });
       return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.1.154beta4",
+  "version": "0.1.154beta6",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",

package/public/locales/en/sdoc-editor.json

@@ -374,5 +374,6 @@
   "Has_been_published_tip": "Revision has been published, Automatically jump to source content after {{ time }} seconds.",
   "Has_conflict_before_publish_tip": "There are conflicts in the document, please resolve it before publishing!",
   "Merge_tip": "There are conflicts in the documents. Do you want to merge them?",
-  "Has_conflict_before_view_changes_tip": "There are conflicts in the document. Please resolve the conflict before viewing the changes!"
+  "Has_conflict_before_view_changes_tip": "There are conflicts in the document. Please resolve the conflict before viewing the changes!",
+  "Has_been_removed_tip": "Document has been removed, please view other documents."
 }