canvas: data method extracted to DocumentElement for exposure in DocumentTextElement

[fnpeditor.git] / src / editor / modules / documentCanvas / documentCanvas.js

diff --git a/src/editor/modules/documentCanvas/documentCanvas.js b/src/editor/modules/documentCanvas/documentCanvas.js
index 4104784..88538c4 100644 (file)
--- a/src/editor/modules/documentCanvas/documentCanvas.js
+++ b/src/editor/modules/documentCanvas/documentCanvas.js
@@ -10,7 +10,7 @@ define([
 
 return function(sandbox) {
 
 
 return function(sandbox) {
 

-    var canvas = canvas3.fromXML('', sandbox.publish);
+    var canvas = canvas3.fromXMLDocument(null, sandbox.publish);

     var canvasWrapper = $(template);
     var shownAlready = false;
     var scrollbarPosition = 0,
     var canvasWrapper = $(template);
     var shownAlready = false;
     var scrollbarPosition = 0,


@@ -37,12 +37,7 @@ return function(sandbox) {
         getView: function() { 
             return canvasWrapper;
         },
         getView: function() { 
             return canvasWrapper;
         },

-        setDocument: function(xml) {
-            canvas.loadWlxml(xml);
-            canvasWrapper.find('#rng-module-documentCanvas-content').empty().append(canvas.view());
-            sandbox.publish('documentSet');
-        },
-        setDocument2: function(wlxmlDocument) {
+        setDocument: function(wlxmlDocument) {

             canvas.loadWlxmlDocument(wlxmlDocument);
             canvasWrapper.find('#rng-module-documentCanvas-content').empty().append(canvas.view());
             sandbox.publish('documentSet');
             canvas.loadWlxmlDocument(wlxmlDocument);
             canvasWrapper.find('#rng-module-documentCanvas-content').empty().append(canvas.view());
             sandbox.publish('documentSet');