sn-collab-editor 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 945bbbb91f556af904fa94727701cd482458d553
-  data.tar.gz: 6107768ec00cd174eb0fb40c8f5859b0aa49b2c7
+SHA256:
+  metadata.gz: c0a98d64abe58588655852b1d68f8eb4efcb2c5db01a2e35dfea0b3c265ff290
+  data.tar.gz: bcaa52bfd373b2048a1c7abf64f908a5b7b0e9c393ea62c7c5a8141550a4d78d
 SHA512:
-  metadata.gz: ea259c4d1e668f3a63ac7d728c3230f89bb4a4a9ba3491eeb765f286da42fe7cea35c12d13e346ebb90a374bfcea683d83c93217bb9ff8e207623fea5df2d845
-  data.tar.gz: 41f0d02bcc4f0ad415a5c13a3f8482f40c6b9a3109e9a2505b2960e6f4efe2ef9d14a0e00e461c3a05b7cc02843ba47e20c04dcae29f6c2b03e487fcadeabf23
+  metadata.gz: e769f65aed5c5fe70515421c74932a52d1760febe287414c94105de4b01679cfeaa1de5bfdf71c9e9866602f8e5c0f0bcd8fbdf9d1f2db47199105c19f5ba876
+  data.tar.gz: 8659819a8f4e464d463b8b0c7a7ef7a528825cb6b36894f1a2e6f86a2ec8309b17503ca1b8094e4a3a804fd6a71d1f5d1ca1aeac1a01736f2fe5e8fdb50fdad5

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

@@ -116,17 +116,26 @@ 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 = "";
+    var noteBody = buildParamsString({url: window.location.href});
     if(editor) {
-      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();
+      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();
     }
-    window.parent.postMessage({text: noteBody, data: {url: window.location.href}, id: noteId}, '*');
+    window.parent.postMessage({text: noteBody, id: noteId}, '*');
   }
 
   if(isInSN) {
@@ -140,14 +149,33 @@ 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 || {};
 
-      let url = data.url;
+      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"];
       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.3'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sn-collab-editor
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Standard Notes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2020-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '5'
 description: Standard Notes editor with collaboration abilities.
 email:
 - hello@standardnotes.org
@@ -90,8 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Standard Notes editor with collaboration abilities.