editor: fixing FF behavior in metadata editor

[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..fff7996 100644 (file)
--- a/src/editor/modules/documentCanvas/documentCanvas.js
+++ b/src/editor/modules/documentCanvas/documentCanvas.js
@@ -1,16 +1,17 @@
 // Module that implements main WYSIWIG edit area
 
 define([
 // Module that implements main WYSIWIG edit area
 
 define([

+'libs/jquery',

 'libs/underscore',
 './canvas/canvas',
 './commands',
 'libs/underscore',
 './canvas/canvas',
 './commands',

-'libs/text!./template.html'], function(_, canvas3, commands, template) {
+'libs/text!./template.html'], function($, _, canvas3, commands, template) {

 
 'use strict';
 
 return function(sandbox) {
 
 
 'use strict';
 
 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,


@@ -34,21 +35,12 @@ return function(sandbox) {
     /* public api */
     return {
         start: function() { sandbox.publish('ready'); },
     /* public api */
     return {
         start: function() { sandbox.publish('ready'); },

-        getView: function() { 
+        getView: function() {

             return canvasWrapper;
         },
             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());
             canvas.loadWlxmlDocument(wlxmlDocument);
             canvasWrapper.find('#rng-module-documentCanvas-content').empty().append(canvas.view());

-            sandbox.publish('documentSet');
-        },
-        getDocument: function() {
-            return canvas.toXML();

         },
         modifyCurrentNodeElement: function(attr, value) {
             var currentNodeElement = canvas.getCurrentNodeElement();
         },
         modifyCurrentNodeElement: function(attr, value) {
             var currentNodeElement = canvas.getCurrentNodeElement();


@@ -59,17 +51,17 @@ return function(sandbox) {
             }
             sandbox.publish('currentNodeElementChanged', currentNodeElement);
         },
             }
             sandbox.publish('currentNodeElementChanged', currentNodeElement);
         },

-        highlightElement: function(element) {
-            element.toggleHighlight(true);
+        highlightElement: function(node) {
+            canvas.toggleElementHighlight(node, true);

         },
         },

-        dimElement: function(element) {
-            element.toggleHighlight(false);
+        dimElement: function(node) {
+            canvas.toggleElementHighlight(node, false);

         },
         },

-        jumpToElement: function(element) {
-            canvas.setCurrentElement(element);
+        jumpToElement: function(node) {
+            canvas.setCurrentElement(node);

         },
         command: function(command, params) {
         },
         command: function(command, params) {

-            commands.run(command, params, canvas);
+            commands.run(command, params, canvas, sandbox.getConfig().user);

             sandbox.publish('contentChanged');
         }
     };
             sandbox.publish('contentChanged');
         }
     };