Yuki Takei %!s(int64=5) %!d(string=hai) anos
pai
achega
af04127934
Modificáronse 2 ficheiros con 14 adicións e 15 borrados
  1. 8 3
      src/client/js/services/PageContainer.js
  2. 6 12
      src/server/models/vo/s2c-message.js

+ 8 - 3
src/client/js/services/PageContainer.js

@@ -240,12 +240,17 @@ export default class PageContainer extends Container {
   }
 
   setLatestRemotePageData(s2cMessagePageUpdated) {
-    this.setState({
+    const newState = {
       remoteRevisionId: s2cMessagePageUpdated.revisionId,
       revisionIdHackmdSynced: s2cMessagePageUpdated.revisionIdHackmdSynced,
       lastUpdateUsername: s2cMessagePageUpdated.lastUpdateUsername,
-      hasDraftOnHackmd: s2cMessagePageUpdated.hasDraftOnHackmd,
-    });
+    };
+
+    if (s2cMessagePageUpdated.hasDraftOnHackmd != null) {
+      newState.hasDraftOnHackmd = s2cMessagePageUpdated.hasDraftOnHackmd;
+    }
+
+    this.setState(newState);
   }
 
   setTocHtml(tocHtml) {

+ 6 - 12
src/server/models/vo/s2c-message.js

@@ -5,6 +5,7 @@ const { serializePageSecurely } = require('../serializers/page-serializer');
  */
 class S2cMessagePageUpdated {
 
+
   constructor(page, user) {
     const serializedPage = serializePageSecurely(page, true);
 
@@ -12,18 +13,11 @@ class S2cMessagePageUpdated {
       _id, revision, revisionHackmdSynced, hasDraftOnHackmd,
     } = serializedPage;
 
-    if (_id != null) {
-      this.pageId = _id;
-    }
-    if (revision != null) {
-      this.revisionId = revision;
-    }
-    if (revisionHackmdSynced != null) {
-      this.revisionIdHackmdSynced = revisionHackmdSynced;
-    }
-    if (hasDraftOnHackmd != null) {
-      this.hasDraftOnHackmd = hasDraftOnHackmd;
-    }
+    this.pageId = _id;
+    this.revisionId = revision;
+    this.revisionIdHackmdSynced = revisionHackmdSynced;
+    this.hasDraftOnHackmd = hasDraftOnHackmd;
+
     if (user != null) {
       this.lastUpdateUsername = user.name;
     }