working

Author: moniNaydenov

lib/editor/tiny/plugins/collaborative/amd/build/collaborater.min.js

@@ -37,7 +37,7 @@ let newHash = '';
 //let newContent = '';
 //let lastHash = '';
 const INTERVALTIMEOUT = 1000;
-const HEADER = "changes Index: a\n===================================================================";
+const HEADER = "changes Index: a\n===================================================================\n";
 
 const fetchOne = (methodname, args) => call([{
     methodname,
@@ -105,7 +105,7 @@ export const register = (editor) => {
                     });
                 }
             });
-
+            let newContent2 = editor.getContent();
             fetchOne('tiny_collaborate_get_changes', {
                 contextid: Options.getContextId(editor),
                 pagehash: Options.getPageHash(editor),
@@ -116,14 +116,14 @@ export const register = (editor) => {
                 if (result) {
                     for (let i in result) {
                         let change = result[i];
-                        c.log('changes', change);
                         let patch = HEADER + change;
-                        currentContent = jsDiff.applyPatch(currentContent, patch);
-                        editor.setContent(currentContent);
-                        sha1(currentContent).then(hash => {
-                            currentHash = hash;
-                        });
+                        c.log('changes', patch);
+                        newContent2 = jsDiff.applyPatch(newContent2, patch);
                     }
+                    editor.setContent(newContent2);
+                    sha1(newContent2).then(hash => {
+                        currentHash = hash;
+                    });
                 }
             });