}
},
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) {
params.document[dir]();
+ callback();
},
},
getState: function(params) {
desc = dir === 'undo' ? gettext('Undo') : gettext('Redo'),
descEmpty = dir === 'undo' ? gettext('There is nothing to undo') : gettext('There is nothing to redo');
if(allowed) {
- desc += ': ' + (_.last(params.document[dir+'Stack']).metadata || gettext('unknown operation'));
+ var metadata = _.last(params.document[dir+'Stack']).metadata;
+ if(metadata) {
+ desc += ': ' + (metadata.description || gettext('unknown operation'));
+ }
}
return {
allowed: allowed,
},
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
});
},
},
return _.extend(state, {
allowed: true,
- execute: function(params) {
+ description: createParams.description,
+ execute: function(callback, params) {
params.fragment.document.transaction(function() {
- var parent = params.fragment.startNode.parent();
- return parent.wrapText({
+ 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.description
+ },
+ success: callback
});
}
});
};
-var createLinkFromSelection = function(params) {
+var createLinkFromSelection = function(callback, params) {
var doc = params.fragment.document,
dialog = Dialog.create({
title: gettext('Create link'),
fields: [
{label: gettext('Link'), name: 'href', type: 'input'}
]
- });
+ }),
+ action = this;
dialog.on('execute', function(event) {
doc.transaction(function() {
- var span = params.fragment.startNode.parent().wrapText({
+ var span = action.params.fragment.startNode.parent().wrapText({
_with: {tagName: 'span', attrs: {'class': 'link'}},
offsetStart: params.fragment.startOffset,
offsetEnd: params.fragment.endOffset,
textNodeIdx: [params.fragment.startNode.getIndex(), params.fragment.endNode.getIndex()]
- });
+ }),
+ doc = params.fragment.document;
span.setAttr('href', event.formData.href);
event.success();
- return span;
+ return doc.createFragment(doc.CaretFragment, {node: span.contents()[0], offset:0});
+ }, {
+ metadata: {
+ description: action.getState().description
+ },
+ 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
+ },
+ success: callback
});
});
dialog.show();
undoRedoAction('undo'),
undoRedoAction('redo'),
commentAction,
- createWrapTextAction({name: 'emphasis', klass: 'emp'}),
- createWrapTextAction({name: 'cite', klass: 'cite'}),
+ createWrapTextAction({name: 'emphasis', klass: 'emp', description: gettext('Mark as emphasized')}),
+ createWrapTextAction({name: 'cite', klass: 'cite', description: gettext('Mark as citation')}),
linkAction
].concat(plugin.actions, templates.actions, footnote.actions, switchTo.actions, lists.actions);