Kaynağa Gözat

enableUnsavedWarningenableUnsavedWarning

yuto-oweseek 4 yıl önce
ebeveyn
işleme
808f4f1515

+ 5 - 5
packages/app/src/components/PageStatusAlert.jsx

@@ -170,14 +170,14 @@ class PageStatusAlert extends React.Component {
 
     let getContentsFunc = null;
 
-    // when remote revision is newer than both
-    if (isHackmdDocumentOutdated && isRevisionOutdated) {
-      getContentsFunc = this.getContentsForUpdatedAlert;
-    }
     // when conflicting on save
-    else if (isRevisionOutdated) {
+    if (isRevisionOutdated) {
       getContentsFunc = this.getContentsForRevisionOutdated;
     }
+    // when remote revision is newer than both
+    else if (isHackmdDocumentOutdated && isRevisionOutdated) {
+      getContentsFunc = this.getContentsForUpdatedAlert;
+    }
     // when someone editing with HackMD
     else if (isHackmdDraftUpdatingInRealtime) {
       getContentsFunc = this.getContentsForSomeoneEditingAlert;