X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/a29236f6a3f5166a3cace703dd5f89cf17405617..1c476cf2d7cf15901a233c86a41e64daba7e0b31:/modules/documentCanvas/documentCanvas.js?ds=sidebyside diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js index 7500e35..2f8dae5 100644 --- a/modules/documentCanvas/documentCanvas.js +++ b/modules/documentCanvas/documentCanvas.js @@ -2,19 +2,34 @@ define([ 'libs/underscore-min', -'./transformations', -'./canvas', -'./canvasManager', './canvas/canvas', -'libs/text!./template.html'], function(_, transformations, Canvas, CanvasManager, canvas3, template) { +'./commands', +'libs/text!./template.html'], function(_, canvas3, commands, template) { 'use strict'; return function(sandbox) { - var canvas = canvas3.fromXML(''); //canvasCanvas.create(); - var manager; + var canvas = canvas3.fromXML('', sandbox.publish); var canvasWrapper = $(template); + var shownAlready = false; + var scrollbarPosition = 0, + cursorPosition; + + canvasWrapper.onShow = function() { + if(!shownAlready) { + shownAlready = true; + canvas.setCurrentElement(canvas.doc().getVerticallyFirstTextElement()); + } else { + canvas.setCursorPosition(cursorPosition); + this.find('#rng-module-documentCanvas-contentWrapper').scrollTop(scrollbarPosition); + } + }; + + canvasWrapper.onHide = function() { + scrollbarPosition = this.find('#rng-module-documentCanvas-contentWrapper').scrollTop(); + cursorPosition = canvas.getCursor().getPosition(); + }; /* public api */ return { @@ -23,47 +38,34 @@ return function(sandbox) { return canvasWrapper; }, setDocument: function(xml) { - canvas.loadWlxml(xml); //canvas.setHTML(transformations.fromXML.getHTMLTree(xml)); - canvasWrapper.find('#rng-module-documentCanvas-content').empty().append(canvas.doc().dom()); - manager = new CanvasManager(canvas, sandbox); + canvas.loadWlxml(xml); + canvasWrapper.find('#rng-module-documentCanvas-content').empty().append(canvas.view()); sandbox.publish('documentSet'); }, getDocument: function() { - return transformations.toXML.getXML(canvas.getContent()); + return canvas.toXML(); }, - modifyCurrentNode: function(attr, value) { - if(manager.currentNode) { - if(attr === 'tag') { - manager.getNodeElement(manager.currentNode).attr('wlxml-'+attr, value); - } - else if(attr === 'class') { - manager.currentNode.setClass(value); - } else { - // changing node meta attr - manager.currentNode.setMetaAttr(attr, value); - } - sandbox.publish('contentChanged'); - sandbox.publish('currentNodeChanged', manager.currentNode); + modifyCurrentNodeElement: function(attr, value) { + var currentNodeElement = canvas.getCurrentNodeElement(); + if(attr === 'class' || attr === 'tag') { + currentNodeElement['setWlxml'+(attr[0].toUpperCase() + attr.substring(1))](value); + } else { + currentNodeElement.setWlxmlMetaAttr(attr, value); } + sandbox.publish('currentNodeElementChanged', currentNodeElement); }, - highlightNode: function(canvasNode) { - manager.highlightNode(canvasNode); - }, - dimNode: function(canvasNode) { - manager.dimNode(canvasNode); - }, - selectNode: function(canvasNode) { - if(!canvasNode.isSame(manager.currentNode)) - manager.selectNode(canvasNode, {movecaret: true}); + highlightElement: function(element) { + element.toggleHighlight(true); }, - toggleGrid: function(toggle) { - manager.toggleGrid(toggle); + dimElement: function(element) { + element.toggleHighlight(false); }, - insertNewNode: function(wlxmlTag, wlxmlClass) { - manager.insertNewNode(wlxmlTag, wlxmlClass); + jumpToElement: function(element) { + canvas.setCurrentElement(element); }, - command: function(command, meta) { - manager.command(command, meta); + command: function(command, params) { + commands.run(command, params, canvas); + sandbox.publish('contentChanged'); } };