X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/620a7d196ada7e95c73418e92715076cfed39f76..0061ce72a4ef53ac99f75a4f3aa51d5c18a27b5e:/src/editor/plugins/core/core.js diff --git a/src/editor/plugins/core/core.js b/src/editor/plugins/core/core.js index 3921635..8ac4f63 100644 --- a/src/editor/plugins/core/core.js +++ b/src/editor/plugins/core/core.js @@ -12,8 +12,30 @@ var _ = require('libs/underscore'), Dialog = require('views/dialog/dialog'), canvasElements = require('plugins/core/canvasElements'), metadataEditor = require('plugins/core/metadataEditor/metadataEditor'), - edumed = require('plugins/core/edumed/edumed'); - + edumed = require('plugins/core/edumed/edumed'), + add_attachments = require('views/attachments/add_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: { @@ -38,6 +60,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); }); @@ -278,6 +315,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; } }; @@ -485,13 +529,21 @@ var createWrapTextAction = function(createParams) { var createLinkFromSelection = function(callback, params) { - var doc = params.fragment.document, - dialog = Dialog.create({ + var fragment = params.fragment, + doc = fragment.document, + text = fragment.startNode.nativeNode.data.substring(fragment.startOffset, fragment.endOffset), + url; + if (text.indexOf('//') >= 0 && text.indexOf(' ') < 0) { + url = text; + } else if (text.substr(0, 4) === 'www.' && text.indexOF(' ') < 0) { + url = 'http://' + text; + } + var 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', initialValue: url || '', prePasteHandler: function(text) { return params.fragment.document.getLinkForUrl(text); }.bind(this) @@ -520,6 +572,7 @@ var createLinkFromSelection = function(callback, params) { }); }); dialog.show(); + add_attachments(dialog); }; var editLink = function(callback, params) {