X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/1dcf69f7caa40430482c79f46c5478f84f6afc0a..9088c2ab96934ee0318e55dadf3573f3325201ff:/modules/visualEditor.js?ds=inline
diff --git a/modules/visualEditor.js b/modules/visualEditor.js
index a607d86..65de452 100644
--- a/modules/visualEditor.js
+++ b/modules/visualEditor.js
@@ -1,5 +1,6 @@
-rng.modules.visualEditor = function(sandbox) {
- var transformations = rng.modules.visualEditor.transformations;
+define(['./visualEditor.transformations'], function(transformations) {
+
+return function(sandbox) {
var view = {
node: $(sandbox.getTemplate('main')()),
@@ -98,6 +99,7 @@ rng.modules.visualEditor = function(sandbox) {
insertNewNode: function(wlxmlTag, wlxmlClass) {
//TODO: Insert inline
var anchor = $(window.getSelection().anchorNode);
+ var anchorOffset = window.getSelection().anchorOffset;
if(anchor[0].nodeType === Node.TEXT_NODE)
anchor = anchor.parent();
if(anchor.text() === '') {
@@ -105,13 +107,21 @@ rng.modules.visualEditor = function(sandbox) {
anchor = anchor.parent();
todel.remove();
}
+ if(anchorOffset > 0 && anchorOffset < anchor.text().length) {
+ if(wlxmlTag === null && wlxmlClass === null) {
+ return this.splitWithNewNode(anchor);
+ }
+ return this.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);
+ }
var newNode = this._createNode(wlxmlTag || anchor.attr('wlxml-tag'), wlxmlClass || anchor.attr('wlxml-class'));
- anchor.after(newNode);
+ if(anchorOffset === 0)
+ anchor.before(newNode)
+ else
+ anchor.after(newNode);
mediator.nodeCreated(newNode);
isDirty = true;
},
wrapSelectionWithNewNode: function(wlxmlTag, wlxmlClass) {
-
var selection = window.getSelection();
if(selection.anchorNode === selection.focusNode && selection.anchorNode.nodeType === Node.TEXT_NODE) {
var startOffset = selection.anchorOffset;
@@ -126,7 +136,7 @@ rng.modules.visualEditor = function(sandbox) {
var suffix = node.data.substr(endOffset);
var core = node.data.substr(startOffset, endOffset - startOffset);
var newNode = this._createNode(wlxmlTag, wlxmlClass);
- newNode.text(core);
+ newNode.text(core || 'test');
$(node).replaceWith(newNode);
newNode.before(prefix);
newNode.after(suffix);
@@ -134,6 +144,31 @@ rng.modules.visualEditor = function(sandbox) {
isDirty = true;
}
},
+ splitWithNewNode: function(node) {
+ var selection = window.getSelection();
+ if(selection.anchorNode === selection.focusNode && selection.anchorNode.nodeType === Node.TEXT_NODE) {
+ var startOffset = selection.anchorOffset;
+ var endOffset = selection.focusOffset;
+ if(startOffset > endOffset) {
+ var tmp = startOffset;
+ startOffset = endOffset;
+ endOffset = tmp;
+ }
+ var anchor = selection.anchorNode;
+ var prefix = anchor.data.substr(0, startOffset);
+ var suffix = anchor.data.substr(endOffset);
+ var prefixNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));
+ var newNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));
+ var suffixNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));
+ prefixNode.text(prefix);
+ suffixNode.text(suffix);
+ node.replaceWith(newNode);
+ newNode.before(prefixNode);
+ newNode.after(suffixNode);
+ mediator.nodeCreated(newNode);
+ isDirty = true;
+ }
+ },
getMetaData: function() {
var toret = {};
this.metaTable.find('tr').each(function() {
@@ -243,6 +278,7 @@ rng.modules.visualEditor = function(sandbox) {
var view = this;
this.node.find('#rng-visualEditor-sidebarButtons a').click(function(e) {
e.preventDefault();
+ e.stopPropagation();
var target = $(e.currentTarget);
if(!target.attr('data-content-id'))
return;
@@ -281,16 +317,18 @@ rng.modules.visualEditor = function(sandbox) {
},
updateEditPane: function(node) {
var pane = this.node.find('#rng-visualEditor-edit');
+ var parentClass = node.parent().attr('wlxml-class');
pane.html( $(sandbox.getTemplate('editPane')({tag: node.attr('wlxml-tag'), klass: node.attr('wlxml-class')})));
var parent = node.parent('[wlxml-tag]').length ? {
- repr: node.parent().attr('wlxml-tag') + ' / ' + (node.parent().attr('wlxml-class') || '[[no class]]'),
+ repr: node.parent().attr('wlxml-tag') + (parentClass ? ' / ' + parentClass : ''),
id: node.parent().attr('id')
} : undefined;
var children = [];
node.children('[wlxml-tag]').each(function() {
var child = $(this);
- children.push({repr: child.attr('wlxml-tag') + ' / ' + (child.attr('wlxml-class') || '[[no class]]'), id: child.attr('id')});
+ var childClass = child.attr('wlxml-class');
+ children.push({repr: child.attr('wlxml-tag') + (childClass ? ' / ' + childClass : ''), id: child.attr('id')});
});
var naviTemplate = sandbox.getTemplate('editPaneNavigation')({parent: parent, children: children});
pane.find('.rng-visualEditor-editPaneSurrouding > div').html($(naviTemplate));
@@ -317,7 +355,7 @@ rng.modules.visualEditor = function(sandbox) {
mediator.toolbarButtonToggled(btn.attr('data-btn'), btn.hasClass('active'));
}
if(btn.attr('data-btn-type') === 'cmd') {
- mediator.toolbarButtonCmd(btn.attr('data-btn'));
+ mediator.toolbarButtonCmd(btn.attr('data-btn'), btn.attr('data-meta'));
}
});
},
@@ -326,9 +364,42 @@ rng.modules.visualEditor = function(sandbox) {
}
}
+ var statusBarView = {
+ node: view.node.find('#rng-visualEditor-statusbar'),
+ setup: function() {
+ var view = this;
+ view.node.on('mouseenter', 'a', function(e) {
+ var target = $(e.target);
+ mediator.nodeHighlightedById(target.attr('data-id'));
+ });
+ view.node.on('mouseleave', 'a', function(e) {
+ var target = $(e.target);
+ mediator.nodeDimmedById(target.attr('data-id'));
+ });
+ view.node.on('click', 'a', function(e) {
+ e.preventDefault();
+ mediator.nodeSelectedById($(e.target).attr('data-id'));
+ });
+ },
+
+ showNode: function(node) {
+ this.node.empty();
+ this.node.html(sandbox.getTemplate('statusBarNodeDisplay')({node: node, parents: node.parents('[wlxml-tag]')}));
+ //node.parents('[wlxml-tag]')
+ },
+
+ highlightNode: function(id) {
+ this.node.find('a[data-id="'+id+'"]').addClass('rng-hover');
+ },
+ dimNode: function(id) {
+ this.node.find('a[data-id="' +id+'"]').removeClass('rng-hover');
+ }
+ }
+
view.setup();
sideBarView.setup();
toolbarView.setup();
+ statusBarView.setup();
var mediator = {
getCurrentNode: function() {
@@ -339,6 +410,7 @@ rng.modules.visualEditor = function(sandbox) {
},
nodeSelected: function(node) {
sideBarView.updateEditPane(node);
+ statusBarView.showNode(node);
},
nodeSelectedById: function(id) {
view.selectNodeById(id);
@@ -355,12 +427,19 @@ rng.modules.visualEditor = function(sandbox) {
if(btn === 'tags')
view.toggleTags(toggle);
},
- toolbarButtonCmd: function(btn) {
+ toolbarButtonCmd: function(btn, meta) {
if(btn === 'new-node') {
+ var wlxmlTag = toolbarView.getOption('newTag-tag');
+ var wlxmlClass = toolbarView.getOption('newTag-class');
+ if(meta) {
+ var split = meta.split('/');
+ wlxmlTag = split[0];
+ wlxmlClass = split[1];
+ }
if(window.getSelection().isCollapsed)
- view.insertNewNode(toolbarView.getOption('newTag-tag'), toolbarView.getOption('newTag-class'));
+ view.insertNewNode(wlxmlTag, wlxmlClass);
else {
- this.wrapWithNodeRequest(toolbarView.getOption('newTag-tag'), toolbarView.getOption('newTag-class'));
+ this.wrapWithNodeRequest(wlxmlTag, wlxmlClass);
}
@@ -369,10 +448,12 @@ rng.modules.visualEditor = function(sandbox) {
nodeHovered: function(node) {
view.highlightNode(node);
sideBarView.highlightNode(node.attr('id'));
+ statusBarView.highlightNode(node.attr('id'));
},
nodeBlured: function(node) {
view.dimNode(node);
sideBarView.dimNode(node.attr('id'));
+ statusBarView.dimNode(node.attr('id'));
},
wrapWithNodeRequest: function(wlxmlTag, wlxmlClass) {
view.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);
@@ -414,4 +495,6 @@ rng.modules.visualEditor = function(sandbox) {
}
}
-};
\ No newline at end of file
+};
+
+});
\ No newline at end of file