switchTo = require('plugins/core/switch'),
lists = require('plugins/core/lists'),
plugin = {name: 'core', actions: [], canvas: {}, documentExtension: {textNode: {}}},
- Dialog = require('views/dialog/dialog');
+ Dialog = require('views/dialog/dialog'),
+ canvasElements = require('plugins/core/canvasElements');
+
plugin.documentExtension.textNode.transformations = {
return true; // break
}
});
+ newNodes.second.contents()
+ .filter(function(child) {
+ return child.object.describesParent;
+ })
+ .forEach(function(child) {
+ //child.detach();
+ newNodes.first.append(child);
+ });
return _.extend(newNodes, {emptyText: emptyText});
},
getChangeRoot: function() {
}
},
mergeContentUp: function() {
- var myPrev = this.prev(),
+ /* globals Node */
+ var myPrev = this,
+ base = this,
ret;
- if(myPrev) {
- ret = myPrev.append(this);
+ if(myPrev.nodeType === Node.TEXT_NODE) {
+ if(myPrev.getIndex() > 0) {
+ return;
+ }
+ myPrev = base = myPrev.parent();
+ }
+
+ myPrev = myPrev && myPrev.prev();
+
+ if(myPrev && myPrev.nodeType === Node.ELEMENT_NODE) {
+ var ptr = this,
+ next;
+ while(ptr) {
+ next = ptr.next();
+ if(!ret) {
+ ret = myPrev.append(ptr);
+ } else {
+ myPrev.append(ptr);
+ }
+
+ ptr = next;
+ }
+ if(base !== this) {
+ base.detach();
+ }
return {node: ret, offset: ret.sameNode(this) ? null : ret.getText().length - this.getText().length};
- } else {
- var range = this.parent().unwrapContent();
- return {node: range.element1, offset: 0};
}
}
};
label: dir === 'undo' ? '<-' : '->',
icon: 'share-alt',
iconStyle: dir === 'undo' ? '-webkit-transform: scale(-1,1); transform: scale(-1, 1)' : '',
- execute: function(params) {
+ execute: function(callback, params) {
+ var metadata = _.last(params.document[dir+'Stack']).metadata,
+ fragment = metadata && metadata.fragment;
params.document[dir]();
+ if(fragment) {
+ if(!fragment.isValid()) {
+ fragment.restoreFromPaths();
+ }
+ if(fragment.isValid()) {
+ callback(fragment);
+ }
+ }
+ callback();
},
},
getState: function(params) {
var allowed = params.document && !!(params.document[dir+'Stack'].length),
desc = dir === 'undo' ? gettext('Undo') : gettext('Redo'),
descEmpty = dir === 'undo' ? gettext('There is nothing to undo') : gettext('There is nothing to redo');
+ if(allowed) {
+ var metadata = _.last(params.document[dir+'Stack']).metadata;
+ if(metadata) {
+ desc += ': ' + (metadata.description || gettext('unknown operation'));
+ }
+ }
return {
allowed: allowed,
description: allowed ? desc : descEmpty
},
stateDefaults: {
icon: 'comment',
- execute: function(params, editor) {
+ execute: function(callback, params, editor) {
/* globals Node */
- var node = params.fragment.node;
+ var node = params.fragment.node,
+ action = this;
if(node.nodeType === Node.TEXT_NODE) {
node = node.parent();
}
var metadata = comment.getMetadata();
metadata.add({key: 'creator', value: creator});
metadata.add({key: 'date', value: dt});
+ }, {
+ metadata: {
+ description: action.getState().description
+ },
+ success: callback
});
},
},
params.fragment instanceof params.fragment.NodeFragment && !params.fragment.node.isRoot()
};
if(state.allowed) {
- state.description = gettext('Insert comment after current node');
+ state.description = gettext('Insert comment');
}
return state;
}
},
parent;
- if(
- !params.fragment || !params.fragment.isValid() ||
- !(params.fragment instanceof params.fragment.TextRangeFragment) ||
- !params.fragment.hasSiblingBoundries()) {
- return _.extend(state, {allowed: false});
- }
-
- parent = params.fragment.startNode.parent();
- if(parent && parent.is(createParams.klass) || parent.isInside(createParams.klass)) {
+ if(!params.fragment || !params.fragment.isValid()) {
return _.extend(state, {allowed: false});
}
- return _.extend(state, {
- allowed: true,
- execute: function(params) {
- params.fragment.document.transaction(function() {
- var parent = params.fragment.startNode.parent();
- return parent.wrapText({
- _with: {tagName: 'span', attrs: {'class': createParams.klass}},
- offsetStart: params.fragment.startOffset,
- offsetEnd: params.fragment.endOffset,
- textNodeIdx: [params.fragment.startNode.getIndex(), params.fragment.endNode.getIndex()]
+ if(params.fragment instanceof params.fragment.CaretFragment && params.fragment.node.isInside(createParams.klass)) {
+ return _.extend(state, {
+ allowed: true,
+ toggled: true,
+ description: createParams.unwrapDescription,
+ execute: function(callback, params) {
+ var node = params.fragment.node,
+ doc = node.document,
+ toRemove = node.getParent(createParams.klass),
+ prefLen = 0;
+
+ if(node.sameNode(toRemove.contents()[0]) && toRemove.isPrecededByTextNode()) {
+ prefLen = toRemove.prev().getText().length;
+ }
+
+ doc.transaction(function() {
+ var ret = toRemove.unwrapContent(),
+ newFragment = params.fragment;
+ if(!newFragment.isValid()) {
+ newFragment = doc.createFragment(doc.CaretFragment, {
+ node: ret.element1,
+ offset: prefLen + params.fragment.offset
+ });
+ }
+ return newFragment;
+ }, {
+ metadata: {
+ description: createParams.unwrapDescription,
+ fragment: params.fragment
+ },
+ success: callback
});
- });
+ }
+ });
+ }
+
+ if(params.fragment instanceof params.fragment.TextRangeFragment && params.fragment.hasSiblingBoundries()) {
+ parent = params.fragment.startNode.parent();
+ if(parent && parent.is(createParams.klass) || parent.isInside(createParams.klass)) {
+ return _.extend(state, {allowed: false});
}
- });
+
+ return _.extend(state, {
+ allowed: true,
+ description: createParams.wrapDescription,
+ execute: function(callback, params) {
+ params.fragment.document.transaction(function() {
+ var parent = params.fragment.startNode.parent(),
+ doc = params.fragment.document,
+ wrapper, lastTextNode;
+
+ wrapper = parent.wrapText({
+ _with: {tagName: 'span', attrs: {'class': createParams.klass}},
+ offsetStart: params.fragment.startOffset,
+ offsetEnd: params.fragment.endOffset,
+ textNodeIdx: [params.fragment.startNode.getIndex(), params.fragment.endNode.getIndex()]
+ });
+
+ lastTextNode = wrapper.getLastTextNode();
+ if(lastTextNode) {
+ return doc.createFragment(doc.CaretFragment, {node: lastTextNode, offset: lastTextNode.getText().length});
+ }
+ }, {
+ metadata: {
+ description: createParams.wrapDescription,
+ fragment: params.fragment
+ },
+ success: callback
+ });
+ }
+ });
+ }
+ return _.extend(state, {allowed: false});
}
};
};
-var createLinkFromSelection = function(params) {
+var createLinkFromSelection = function(callback, params) {
var doc = params.fragment.document,
dialog = Dialog.create({
title: gettext('Create link'),
executeButtonText: gettext('Apply'),
cancelButtonText: gettext('Cancel'),
fields: [
- {label: gettext('Link'), name: 'href', type: 'input'}
+ {label: gettext('Link'), name: 'href', type: 'input',
+ prePasteHandler: function(text) {
+ return params.fragment.document.getLinkForUrl(text);
+ }.bind(this)
+ }
]
- });
+ }),
+ action = this;
dialog.on('execute', function(event) {
doc.transaction(function() {
- var span = params.fragment.startNode.parent().wrapText({
- _with: {tagName: 'span', attrs: {'class': 'link'}},
+ var span = action.params.fragment.startNode.parent().wrapText({
+ _with: {tagName: 'span', attrs: {'class': 'link', href: event.formData.href }},
offsetStart: params.fragment.startOffset,
offsetEnd: params.fragment.endOffset,
textNodeIdx: [params.fragment.startNode.getIndex(), params.fragment.endNode.getIndex()]
- });
- span.setAttr('href', event.formData.href);
+ }),
+ doc = params.fragment.document;
event.success();
- return span;
+ return doc.createFragment(doc.CaretFragment, {node: span.contents()[0], offset:0});
+ }, {
+ metadata: {
+ description: action.getState().description,
+ fragment: params.fragment
+ },
+ success: callback
});
});
dialog.show();
};
-var editLink = function(params) {
+var editLink = function(callback, params) {
var doc = params.fragment.document,
link = params.fragment.node.getParent('link'),
dialog = Dialog.create({
fields: [
{label: gettext('Link'), name: 'href', type: 'input', initialValue: link.getAttr('href')}
]
- });
+ }),
+ action = this;
dialog.on('execute', function(event) {
doc.transaction(function() {
link.setAttr('href', event.formData.href);
event.success();
+ return params.fragment;
+ }, {
+ metadata: {
+ description: action.getState().description,
+ fragment: params.fragment
+ },
+ success: callback
});
});
dialog.show();
if(params.fragment instanceof params.fragment.CaretFragment) {
if(params.fragment.node.isInside('link')) {
- return {allowed: true, toggled: true, execute: editLink};
+ return {
+ allowed: true,
+ toggled: true,
+ description: gettext('Edit link'),
+ execute: editLink
+ };
}
}
return {allowed: false};
undoRedoAction('undo'),
undoRedoAction('redo'),
commentAction,
- createWrapTextAction({name: 'emphasis', klass: 'emp'}),
- createWrapTextAction({name: 'cite', klass: 'cite'}),
+ createWrapTextAction({name: 'emphasis', klass: 'emp', wrapDescription: gettext('Mark as emphasized'), unwrapDescription: gettext('Remove emphasis')}),
+ createWrapTextAction({name: 'cite', klass: 'cite', wrapDescription: gettext('Mark as citation'), unwrapDescription: gettext('Remove citation')}),
linkAction
].concat(plugin.actions, templates.actions, footnote.actions, switchTo.actions, lists.actions);
templates.actions[0].params.template.options = config.templates;
};
+plugin.canvasElements = canvasElements;
+
return plugin;
});
\ No newline at end of file
fnp / fnpeditor.git / blobdiff