sn-collab-editor 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb8e0571a85bf0ea7a4b0aaebf1071fc4337a0c6
-  data.tar.gz: 06126daef55a76ee32d5285e2e286314977978fd
+  metadata.gz: 945bbbb91f556af904fa94727701cd482458d553
+  data.tar.gz: 6107768ec00cd174eb0fb40c8f5859b0aa49b2c7
 SHA512:
-  metadata.gz: eb90203fc2900d5b9fad7cc3ca95304287141e74c8df248dda35605b1516f92c6ac87fceada175fdad97f4c7006e3c1114f284e37e5ea50b26ed76eb5dc295b7
-  data.tar.gz: e21765f8ed8ee88f4885eb2a7710e54a96dce58c7980e6f86e03a5a267891cd5d858b602e65921d7210a4e7271f94827cbbc0b54f3247aa84dd3975cfb7ee541
+  metadata.gz: ea259c4d1e668f3a63ac7d728c3230f89bb4a4a9ba3491eeb765f286da42fe7cea35c12d13e346ebb90a374bfcea683d83c93217bb9ff8e207623fea5df2d845
+  data.tar.gz: 41f0d02bcc4f0ad415a5c13a3f8482f40c6b9a3109e9a2505b2960e6f4efe2ef9d14a0e00e461c3a05b7cc02843ba47e20c04dcae29f6c2b03e487fcadeabf23

data/README.md

@@ -1 +1 @@
-More info [here](http://localhost:3002/extensions/collaborative-editor)
+More information can be found on the [Standard Notes website](https://standardnotes.org/extensions/collaborative-editor).

data/app/assets/javascripts/collab/documents.js

@@ -116,26 +116,17 @@ document.addEventListener("DOMContentLoaded", function(event) {
 
   // ** Communication with Standard Notes App **
 
-  function buildParamsString(doc) {
-    var string = "";
-    for(var key in doc) {
-      string += key + ": " + doc[key] + "\n";
-    }
-    string += "%%Do not modify above this line%%";
-    return string;
-  }
-
   function sendDocToSN() {
     if(!isInSN) {
       return;
     }
 
-    var noteBody = buildParamsString({url: window.location.href});
+    var noteBody = "";
     if(editor) {
-      var disclaimer = "// text you enter below will not transfer to the live editor.\n// the below is just a backup for your records";
-      noteBody += "\n\n" + disclaimer + "\n\n" + getEditorValue();
+      var disclaimer = "// The below is a copy of the last changes made to the doc\n// Changes you make below will not transfer over" ;
+      noteBody += disclaimer + "\n\n" + getEditorValue();
     }
-    window.parent.postMessage({text: noteBody, id: noteId}, '*');
+    window.parent.postMessage({text: noteBody, data: {url: window.location.href}, id: noteId}, '*');
   }
 
   if(isInSN) {
@@ -149,33 +140,14 @@ document.addEventListener("DOMContentLoaded", function(event) {
     window.addEventListener("message", function(event){
       var text = event.data.text || "";
       sessionStorage.setItem("sn_lastNoteId", event.data.id);
+      var data = event.data.data || {};
 
-      var splitTarget = "%%Do not modify above this line%%";
-      var comps = text.split(splitTarget);
-      var snText;
-      var hasParams = text.indexOf(splitTarget) != -1;
-      if(hasParams) {
-        snText = comps[1];
-      } else {
-        snText = text;
-        sessionStorage.setItem("sn_text", snText)
-      }
-
-
-      var paramString = comps[0];
-      var params = {};
-      var lines = paramString.split("\n");
-      lines.forEach(function(line){
-        var comps = line.split(": ");
-        var key = comps[0];
-        var value = comps[1];
-        params[key] = value;
-      })
-
-      let url = params["url"];
+      let url = data.url;
       if (url) {
         window.location.href = url;
       } else {
+        // we're only interested in the incoming text if this is a new document, otherwise the changes are retreived from our own server
+        sessionStorage.setItem("sn_text", text)
         createNewDocument();
       }
     }, false);

data/lib/collab/version.rb

@@ -1,3 +1,3 @@
 module Collab
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sn-collab-editor
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Standard Notes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-26 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails