Reflect kaavio updates. Partially addresses #313. Close #314.

wikipathways · Jun 11, 2015 · 0682aac · 0682aac
1 parent 064e1df
commit 0682aac
Show file tree

Hide file tree

Showing 3 changed files with 143,930 additions and 64,186 deletions.
diff --git a/lib/editor/editor.js b/lib/editor/editor.js
@@ -31,7 +31,7 @@ Editor.prototype.save = function save(args) {
 
   // TODO refactor once pvjson -> gpml converter is done
   //var gpmlDocJquery = pvjs.sourceData.original;
-  var gpmlDocJquery = pvjs.options.original;
+  var gpmlDocJquery = args.gpmlDocJquery;
   var gpmlDoc = gpmlDocJquery[0];
 
   var delta = diffpatcher.diff(
@@ -85,8 +85,6 @@ Editor.prototype.save = function save(args) {
       var gpmlFontWeight = fontWeight.replace('bold', 'Bold');
       graphicsElement.setAttribute('FontWeight', gpmlFontWeight);
     }
-
-    //pvjs.editor.save(gpmlDocJquery);
   });
 
   /***********************************************

diff --git a/lib/main.js b/lib/main.js
@@ -5,12 +5,10 @@ var highland = require('highland');
 var insertCss = require('insert-css');
 var jsonld = require('jsonld');
 // TODO use the one at github
-//var Kaavio = {};
 var Kaavio = require('../../kaavio/index.js');
 //var Kaavio = require('kaavio');
 var m = require('mithril');
 
-//Kaavio.prototype.Editor = require('./editor/editor.js');
 /*
 _.assign(Kaavio.Editor.prototype, Object.create(Editor.prototype));
 Kaavio.Editor.prototype.constructor = Kaavio.Editor;
@@ -121,9 +119,11 @@ function Pvjs(selector, options) {
           pvjs.sourceData.pvjson = pvjson;
           pvjsonOriginal = JSON.parse(JSON.stringify(pvjson));
 
-          /*
           // TODO don't repeat the code below. DRY it up.
           if (pvjs.options.editor && pvjs.options.editor !== 'disabled') {
+            var Editor = require('./editor/editor.js');
+            pvjs.editor = new Editor(pvjs);
+
             // TODO why is this event happening twice when it should happen once?
             selector.addEventListener('kaaviodatachange', function(e) {
               console.log('kaaviodatachange event received in pvjs.js');
@@ -133,26 +133,26 @@ function Pvjs(selector, options) {
               });
             }, false);
           }
-          //*/
           Kaavio.call(pvjs, pvjs.selector, pvjs.sourceData);
           return;
         });
       } else {
         // TODO don't repeat the code below. DRY it up.
-        /*
         if (pvjs.options.editor && pvjs.options.editor !== 'disabled') {
+          var Editor = require('./editor/editor.js');
+          pvjs.editor = new Editor(pvjs);
 
           // TODO why is this event happening twice when it should happen once?
           selector.addEventListener('kaaviodatachange', function(e) {
             console.log('kaaviodatachange event received in pvjs.js');
             pvjs.editor.save({
               pvjson: e.detail.pvjson,
-              pvjsonOriginal: pvjsonOriginal
+              pvjsonOriginal: pvjsonOriginal,
+              gpmlDocJquery: pvjs.options.original
             });
           }, false);
         }
         Kaavio.call(pvjs, pvjs.selector, pvjs.sourceData);
-        //*/
         return;
       }
     } else {