X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/4638325970a04404505f5ce87838eee6395b8f83..215b225:/src/editor/plugins/core/core.js?ds=sidebyside
diff --git a/src/editor/plugins/core/core.js b/src/editor/plugins/core/core.js
index e300232..bc74e6b 100644
--- a/src/editor/plugins/core/core.js
+++ b/src/editor/plugins/core/core.js
@@ -11,10 +11,34 @@ var _ = require('libs/underscore'),
plugin = {name: 'core', actions: [], canvas: {}, documentExtension: {textNode: {}, documentNode: {}}},
Dialog = require('views/dialog/dialog'),
canvasElements = require('plugins/core/canvasElements'),
- metadataEditor = require('plugins/core/metadataEditor/metadataEditor');
+ metadataEditor = require('plugins/core/metadataEditor/metadataEditor'),
+ edumed = require('plugins/core/edumed/edumed'),
+ attachments = require('views/attachments/attachments');
+
+var exerciseFix = function(newNodes) {
+ var list, exercise, max, addedItem, answerValues;
+ if(newNodes.created.is('item')) {
+ list = newNodes.created.parent();
+ exercise = list.parent();
+ if(exercise && exercise.is('exercise')) {
+ if(exercise.is('exercise.order')) {
+ answerValues = exercise.object.getItems()
+ .map(function(item) {
+ if(!addedItem && item.node.sameNode(newNodes.created)) {
+ addedItem = item;
+ }
+ return item.getAnswer();
+ });
+ max = Math.max.apply(Math.max, answerValues);
+ addedItem.setAnswer(max + 1);
+ }
+ }
+ }
+};
+
plugin.documentExtension.textNode.transformations = {
breakContent: {
impl: function(args) {
@@ -38,6 +62,21 @@ plugin.documentExtension.textNode.transformations = {
return true; // break
}
});
+
+ /*
+ /*
+ This makes sure that adding a new item to the list in some of the edumed exercises
+ sets an answer attribute that makes sense (and not just copies it which would create
+ a duplicate value).
+
+ This won't be neccessary when/if we introduce canvas element own key event handlers.
+
+ Alternatively, WLXML elements could implement their own item split methods that we
+ would delegate to.
+ */
+ exerciseFix(newNodes);
+ /* */
+
parentDescribingNodes.forEach(function(node) {
newNodes.first.append(node);
});
@@ -185,7 +224,7 @@ plugin.documentExtension.documentNode.transformations = {
return toMerge.is({tagName: 'div', 'klass': 'p'}) || (toMerge.is({tagName: 'div'}) && toMerge.getClass() === '');
},
run: function() {
- if(prev && prev.is('p') || prev.is({tagName: 'header'})) {
+ if(prev && (prev.is('p') || prev.is({tagName: 'header'}))) {
return merge(toMerge, prev);
}
if(prev && prev.is('list')) {
@@ -224,7 +263,16 @@ plugin.documentExtension.documentNode.transformations = {
} else if(prev.is({tagName: 'span'})) {
if((txtNode = prev.getLastTextNode())) {
txt = txtNode.getText();
- txtNode.setText(txt.substr(0, txt.length-1));
+ if(txt.length > 1) {
+ txtNode.setText(txt.substr(0, txt.length-1));
+ } else {
+ if(txtNode.parent().contents().length === 1) {
+ txtNode.parent().detach();
+ } else {
+ txtNode.detach();
+ }
+
+ }
return toret;
}
}
@@ -269,6 +317,13 @@ plugin.documentExtension.documentNode.transformations = {
}
});
return toret;
+ },
+ insertNewNode: function () {
+ var node = this;
+ var newElement = this.document.createDocumentNode({tagName: 'div', attrs: {class: 'p'}});
+ node.after(newElement);
+ newElement.append({text: ''});
+ return newElement;
}
};
@@ -433,7 +488,7 @@ var createWrapTextAction = function(createParams) {
});
}
- if(params.fragment instanceof params.fragment.TextRangeFragment && params.fragment.hasSiblingBoundries()) {
+ if(params.fragment instanceof params.fragment.TextRangeFragment && params.fragment.hasSiblingBoundaries()) {
parent = params.fragment.startNode.parent();
if(parent && parent.is(createParams.klass) || parent.isInside(createParams.klass)) {
return _.extend(state, {allowed: false});
@@ -475,6 +530,7 @@ var createWrapTextAction = function(createParams) {
};
+
var createLinkFromSelection = function(callback, params) {
var doc = params.fragment.document,
dialog = Dialog.create({
@@ -485,7 +541,8 @@ var createLinkFromSelection = function(callback, params) {
{label: gettext('Link'), name: 'href', type: 'input',
prePasteHandler: function(text) {
return params.fragment.document.getLinkForUrl(text);
- }.bind(this)
+ }.bind(this),
+ description: '' + gettext('attachment library') + ''
}
]
}),
@@ -511,6 +568,9 @@ var createLinkFromSelection = function(callback, params) {
});
});
dialog.show();
+ $(".attachment-library", dialog.$el).on('click', function() {
+ attachments.select(function(v) {$("input", dialog.$el).val(v);});
+ });
};
var editLink = function(callback, params) {
@@ -556,7 +616,7 @@ var linkAction = {
}
if(params.fragment instanceof params.fragment.TextRangeFragment) {
- if(!params.fragment.hasSiblingBoundries() || params.fragment.startNode.parent().is('link')) {
+ if(!params.fragment.hasSiblingBoundaries() || params.fragment.startNode.parent().is('link')) {
return {allowed: false};
}
return {
@@ -580,6 +640,7 @@ var linkAction = {
}
};
+
var metadataParams = {};
plugin.actions = [
@@ -590,8 +651,7 @@ plugin.actions = [
createWrapTextAction({name: 'cite', klass: 'cite', wrapDescription: gettext('Mark as citation'), unwrapDescription: gettext('Remove citation')}),
linkAction,
metadataEditor.action(metadataParams)
-].concat(plugin.actions, templates.actions, footnote.actions, switchTo.actions, lists.actions);
-
+].concat(plugin.actions, templates.actions, footnote.actions, switchTo.actions, lists.actions, edumed.actions);
plugin.config = function(config) {
@@ -608,7 +668,7 @@ plugin.config = function(config) {
});
};
-plugin.canvasElements = canvasElements;
+plugin.canvasElements = canvasElements.concat(edumed.canvasElements);
return plugin;