fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix
[fnpeditor.git]
/
modules
/
documentCanvas
/
documentCanvas.js
diff --git
a/modules/documentCanvas/documentCanvas.js
b/modules/documentCanvas/documentCanvas.js
index
bec74fc
..
4ca0a4d
100644
(file)
--- a/
modules/documentCanvas/documentCanvas.js
+++ b/
modules/documentCanvas/documentCanvas.js
@@
-3,16
+3,15
@@
define([
\r
'libs/underscore-min',
\r
'./transformations',
\r
define([
\r
'libs/underscore-min',
\r
'./transformations',
\r
-'./wlxmlNode',
\r
'./canvas',
\r
'./canvasManager',
\r
'./canvas',
\r
'./canvasManager',
\r
-'libs/text!./template.html'], function(_, transformations,
wlxmlNode,
Canvas, CanvasManager, template) {
\r
+'libs/text!./template.html'], function(_, transformations, Canvas, CanvasManager, template) {
\r
\r
'use strict';
\r
\r
return function(sandbox) {
\r
\r
\r
'use strict';
\r
\r
return function(sandbox) {
\r
\r
- var canvas =
new Canvas.Canvas
();
\r
+ var canvas =
Canvas.create
();
\r
var manager = new CanvasManager(canvas, sandbox);
\r
\r
/* public api */
\r
var manager = new CanvasManager(canvas, sandbox);
\r
\r
/* public api */
\r
@@
-22,11
+21,11
@@
return function(sandbox) {
return canvas.dom;
\r
},
\r
setDocument: function(xml) {
\r
return canvas.dom;
\r
},
\r
setDocument: function(xml) {
\r
- canvas.set
XML(xml
);
\r
+ canvas.set
HTML(transformations.fromXML.getHTMLTree(xml)
);
\r
sandbox.publish('documentSet');
\r
},
\r
getDocument: function() {
\r
sandbox.publish('documentSet');
\r
},
\r
getDocument: function() {
\r
- return
canvas.toXML();
\r
+ return
transformations.toXML.getXML(canvas.getContent())
\r
},
\r
modifyCurrentNode: function(attr, value) {
\r
if(manager.currentNode) {
\r
},
\r
modifyCurrentNode: function(attr, value) {
\r
if(manager.currentNode) {
\r
@@
-34,15
+33,15
@@
return function(sandbox) {
sandbox.publish('contentChanged');
\r
}
\r
},
\r
sandbox.publish('contentChanged');
\r
}
\r
},
\r
- highlightNode: function(
wlxml
Node) {
\r
- manager.highlightNode(
wlxml
Node);
\r
+ highlightNode: function(
canvas
Node) {
\r
+ manager.highlightNode(
canvas
Node);
\r
},
\r
},
\r
- dimNode: function(
wlxml
Node) {
\r
- manager.dimNode(
wlxml
Node);
\r
+ dimNode: function(
canvas
Node) {
\r
+ manager.dimNode(
canvas
Node);
\r
},
\r
},
\r
- selectNode: function(
wlxml
Node) {
\r
- if(!
wlxmlNode.is
(manager.currentNode))
\r
- manager.selectNode(
wlxml
Node, {movecaret: true});
\r
+ selectNode: function(
canvas
Node) {
\r
+ if(!
canvasNode.isSame
(manager.currentNode))
\r
+ manager.selectNode(
canvas
Node, {movecaret: true});
\r
},
\r
toggleGrid: function(toggle) {
\r
manager.toggleGrid(toggle);
\r
},
\r
toggleGrid: function(toggle) {
\r
manager.toggleGrid(toggle);
\r