integration wip: setting/handling contentSet event (source/canvas)

diff --git a/src/editor/modules/documentCanvas/canvas/wlxmlListener.js b/src/editor/modules/documentCanvas/canvas/wlxmlListener.js
index cbb582d..ec3001d 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/wlxmlListener.js
+++ b/src/editor/modules/documentCanvas/canvas/wlxmlListener.js
@@ -21,6 +21,10 @@ $.extend(Listener.prototype, {
                 handler.bind(this)(event);
             }
         }, this);
                 handler.bind(this)(event);
             }
         }, this);

+
+        wlxmlDocument.on('contentSet', function() {
+            this.canvas.loadWlxmlDocument(wlxmlDocument);
+        }, this);

     }
 });
 
     }
 });
 

diff --git a/src/editor/modules/sourceEditor/sourceEditor.js b/src/editor/modules/sourceEditor/sourceEditor.js
index 2e2e6ab..8159680 100644 (file)
--- a/src/editor/modules/sourceEditor/sourceEditor.js
+++ b/src/editor/modules/sourceEditor/sourceEditor.js
@@ -4,7 +4,26 @@ define(function() {
 
 return function(sandbox) {
 
 
 return function(sandbox) {
 

-    var view = $(sandbox.getTemplate('main')());
+    var view = $(sandbox.getTemplate('main')()),
+        documentIsDirty = true,
+        documentEditedHere = false,
+        wlxmlDocument;
+
+    view.onShow = function() {
+        if(documentIsDirty) {
+            editor.setValue(wlxmlDocument.toXML());
+            editor.gotoLine(0);
+            sandbox.publish('documentSet');
+            documentIsDirty = false;
+        }
+    }
+
+    view.onHide = function() {
+        if(documentEditedHere) {
+            documentEditedHere = false;
+            wlxmlDocument.loadXML(editor.getValue());
+        }
+    }

     
     var editor = ace.edit(view.find('#rng-sourceEditor-editor')[0]),
         session = editor.getSession();
     
     var editor = ace.edit(view.find('#rng-sourceEditor-editor')[0]),
         session = editor.getSession();


@@ -13,11 +32,11 @@ return function(sandbox) {
     session.setUseWrapMode(true);
     
     $('textarea', view).on('keyup', function() {
     session.setUseWrapMode(true);
     
     $('textarea', view).on('keyup', function() {

-        sandbox.publish('xmlChanged');
+        documentEditedHere = true;

     });
     
     editor.getSession().on('change', function() {
     });
     
     editor.getSession().on('change', function() {

-        sandbox.publish('xmlChanged');
+        documentEditedHere = true;

     });
     return {
         start: function() {
     });
     return {
         start: function() {


@@ -27,9 +46,10 @@ return function(sandbox) {
             return view;
         },
         setDocument: function(document) {
             return view;
         },
         setDocument: function(document) {

-            editor.setValue(document.toXML());
-            editor.gotoLine(0);
-            sandbox.publish('documentSet');
+            wlxmlDocument = document;
+            wlxmlDocument.on('change', function() {
+                documentIsDirty = true;
+            });

         },
         getDocument: function() {
             return editor.getValue();
         },
         getDocument: function() {
             return editor.getValue();