From 88afe908cdc2cd584c551730a98d1b312df48958 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Wed, 6 Aug 2014 14:22:18 +0200 Subject: [PATCH 01/16] wlxml: isContextRoot for the reminder of edumed exercises (fixup) --- src/wlxml/extensions/edumed/edumed.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/wlxml/extensions/edumed/edumed.js b/src/wlxml/extensions/edumed/edumed.js index 6e01d6e..ca29ad3 100644 --- a/src/wlxml/extensions/edumed/edumed.js +++ b/src/wlxml/extensions/edumed/edumed.js @@ -157,6 +157,9 @@ var extension = {wlxmlClass: {'exercise.order': { }}}; var choiceMethods = { + isContextRoot: function(node) { + return this.object.isChoiceList(node.parent()) || this.sameNode(node); + }, getChoiceList: function() { return this.contents() .filter(function(n) { return this.object.isChoiceList(n); }.bind(this))[0]; @@ -209,6 +212,14 @@ extension.wlxmlClass['exercise.choice.true-or-false'] = { methods: choiceMethods }; +extension.wlxmlClass['exercise.gap'] = extension.wlxmlClass['exercise.replace'] = { + methods: { + isContextRoot: function(node) { + return this.sameNode(node); + } + } +}; + extension.document = { methods: { edumedCreateExerciseNode: function(klass) { -- 2.20.1 From c654f07dd8b596abc328f1f57beef06bffa63149 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Wed, 6 Aug 2014 14:30:29 +0200 Subject: [PATCH 02/16] editor: Missing names of exercises on a canvas --- src/editor/plugins/core/edumed/choice/choiceBase.js | 2 +- src/editor/plugins/core/edumed/choice/choiceMulti.js | 1 + src/editor/plugins/core/edumed/choice/choiceSingle.js | 1 + src/editor/plugins/core/edumed/choice/choiceTrueOrFalse.js | 1 + src/editor/plugins/core/edumed/choice/element.html | 2 +- src/editor/plugins/core/edumed/gaps/view.html | 2 +- src/editor/plugins/core/edumed/order/view.html | 2 +- src/editor/plugins/core/edumed/replace/view.html | 2 +- 8 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/editor/plugins/core/edumed/choice/choiceBase.js b/src/editor/plugins/core/edumed/choice/choiceBase.js index 3bd6ed5..eaf1c7c 100644 --- a/src/editor/plugins/core/edumed/choice/choiceBase.js +++ b/src/editor/plugins/core/edumed/choice/choiceBase.js @@ -12,7 +12,7 @@ var choiceBase = Object.create(elementBase); _.extend(choiceBase, { init: function() { elementBase.init.call(this); - this.view = $(_.template(template)({type: this.type})); + this.view = $(_.template(template)({type: this.type, name: this.name})); this._container().append(this.view); this.createContainer(this.wlxmlNode.contents().filter(function(n) {return !n.is('list');}), { diff --git a/src/editor/plugins/core/edumed/choice/choiceMulti.js b/src/editor/plugins/core/edumed/choice/choiceMulti.js index a05346c..0983930 100644 --- a/src/editor/plugins/core/edumed/choice/choiceMulti.js +++ b/src/editor/plugins/core/edumed/choice/choiceMulti.js @@ -13,6 +13,7 @@ var $ = require('libs/jquery'), var choiceMulti = Object.create(choiceBase); _.extend(choiceMulti, { type: 'multi', + name: gettext('Multiple Choice'), createListView: function(listNode) { return new ListView(this, listNode, { onItemViewAdded: function(itemView) { diff --git a/src/editor/plugins/core/edumed/choice/choiceSingle.js b/src/editor/plugins/core/edumed/choice/choiceSingle.js index 9346363..6824d44 100644 --- a/src/editor/plugins/core/edumed/choice/choiceSingle.js +++ b/src/editor/plugins/core/edumed/choice/choiceSingle.js @@ -13,6 +13,7 @@ var $ = require('libs/jquery'), var choiceSingle = Object.create(choiceBase); _.extend(choiceSingle, { type: 'single', + name: gettext('Single Choice'), init: function() { this._comboName = _.uniqueId('edumed_exercise_hash_'); choiceBase.init.call(this); diff --git a/src/editor/plugins/core/edumed/choice/choiceTrueOrFalse.js b/src/editor/plugins/core/edumed/choice/choiceTrueOrFalse.js index 7ac0470..86fe809 100644 --- a/src/editor/plugins/core/edumed/choice/choiceTrueOrFalse.js +++ b/src/editor/plugins/core/edumed/choice/choiceTrueOrFalse.js @@ -14,6 +14,7 @@ var $ = require('libs/jquery'), var trueOrFalse = Object.create(choiceBase); _.extend(trueOrFalse, { type: 'true-or-false', + name: 'True or False', createListView: function(listNode) { return new ListView(this, listNode, { onItemViewAdded: function(itemView) { diff --git a/src/editor/plugins/core/edumed/choice/element.html b/src/editor/plugins/core/edumed/choice/element.html index ba4bdd0..665d957 100644 --- a/src/editor/plugins/core/edumed/choice/element.html +++ b/src/editor/plugins/core/edumed/choice/element.html @@ -1,5 +1,5 @@
-
<%= gettext('Exercise') %>: <%= type %>
+
<%= gettext('Exercise') %>: <%= name %>
\ No newline at end of file diff --git a/src/editor/plugins/core/edumed/gaps/view.html b/src/editor/plugins/core/edumed/gaps/view.html index bd1552e..7d4210b 100644 --- a/src/editor/plugins/core/edumed/gaps/view.html +++ b/src/editor/plugins/core/edumed/gaps/view.html @@ -1,4 +1,4 @@
-
<%= gettext('Exercise') %>
+
<%= gettext('Exercise') %>: <%= gettext('Gaps') %>
\ No newline at end of file diff --git a/src/editor/plugins/core/edumed/order/view.html b/src/editor/plugins/core/edumed/order/view.html index 492b8f4..561de89 100644 --- a/src/editor/plugins/core/edumed/order/view.html +++ b/src/editor/plugins/core/edumed/order/view.html @@ -1,5 +1,5 @@
-
<%= gettext('Exercise') %>
+
<%= gettext('Exercise') %>: <%= gettext('Order') %>
  • <%= gettext('Initial') %>
    • diff --git a/src/editor/plugins/core/edumed/replace/view.html b/src/editor/plugins/core/edumed/replace/view.html index 2378d40..d427539 100644 --- a/src/editor/plugins/core/edumed/replace/view.html +++ b/src/editor/plugins/core/edumed/replace/view.html @@ -1,4 +1,4 @@
    -
    <%= gettext('Exercise') %>
    +
    <%= gettext('Exercise') %>: <%= gettext('Replace') %>
    \ No newline at end of file -- 2.20.1 From f9be0369bec7632daa68f706951bcaf8ac8284e7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Wed, 6 Aug 2014 14:33:24 +0200 Subject: [PATCH 03/16] editor: edumed exercise - allow for exercise insertion after the edited one --- src/editor/plugins/core/edumed/actions.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/editor/plugins/core/edumed/actions.js b/src/editor/plugins/core/edumed/actions.js index 97237ba..6d8051e 100644 --- a/src/editor/plugins/core/edumed/actions.js +++ b/src/editor/plugins/core/edumed/actions.js @@ -26,6 +26,9 @@ var createAction = function(actionConfig) { if(node.nodeType === Node.TEXT_NODE) { node = node.parent(); } + if(node.isInside('exercise')) { + node = node.getParent('exercise'); + } node.document.transaction(function() { var exerciseNode = node.after(node.document.edumedCreateExerciseNode(actionConfig.exercise)), @@ -57,7 +60,7 @@ var createAction = function(actionConfig) { }, getState: function(params) { return { - allowed: params.fragment && params.fragment.isValid() && params.fragment instanceof params.fragment.NodeFragment && !params.fragment.node.isInside('exercise'), + allowed: params.fragment && params.fragment.isValid() && params.fragment instanceof params.fragment.NodeFragment, description: gettext('Insert exercise: ' + actionConfig.exerciseTitle) }; } -- 2.20.1 From c38178af914a1015d94cc0cdef8dbb2a6ea21427 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Wed, 6 Aug 2014 15:06:28 +0200 Subject: [PATCH 04/16] editor: edumed exercises - translation fixes --- src/editor/plugins/core/edumed/actions.js | 6 +++--- src/editor/plugins/core/edumed/choice/choiceTrueOrFalse.js | 2 +- src/editor/plugins/core/edumed/elementBase.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/editor/plugins/core/edumed/actions.js b/src/editor/plugins/core/edumed/actions.js index 6d8051e..b79d109 100644 --- a/src/editor/plugins/core/edumed/actions.js +++ b/src/editor/plugins/core/edumed/actions.js @@ -61,7 +61,7 @@ var createAction = function(actionConfig) { getState: function(params) { return { allowed: params.fragment && params.fragment.isValid() && params.fragment instanceof params.fragment.NodeFragment, - description: gettext('Insert exercise: ' + actionConfig.exerciseTitle) + description: gettext('Insert exercise') + ': ' + actionConfig.exerciseTitle }; } }; @@ -70,8 +70,8 @@ var createAction = function(actionConfig) { return [ createAction({name: 'insertOrderExercise', icon: 'random', exercise: 'order', exerciseTitle: gettext('Order')}), - createAction({name: 'insertChoiceSingleExercise', icon: 'ok-circle', exercise: 'choice.single', exerciseTitle: gettext('Single choice')}), - createAction({name: 'insertChoiceMultiExercise', icon: 'check', exercise: 'choice', exerciseTitle: gettext('Mutiple Choice')}), + createAction({name: 'insertChoiceSingleExercise', icon: 'ok-circle', exercise: 'choice.single', exerciseTitle: gettext('Single Choice')}), + createAction({name: 'insertChoiceMultiExercise', icon: 'check', exercise: 'choice', exerciseTitle: gettext('Multiple Choice')}), createAction({name: 'insertChoiceTrueOrFalseExercise', icon: 'adjust', exercise: 'choice.true-or-false', exerciseTitle: gettext('True or False')}), createAction({name: 'insertGapsExercise', icon: 'question-sign', exercise: 'gap', exerciseTitle: gettext('Gaps')}), createAction({name: 'insertReplaceExercise', icon: 'thumbs-down', exercise: 'replace', exerciseTitle: gettext('Replace')}) diff --git a/src/editor/plugins/core/edumed/choice/choiceTrueOrFalse.js b/src/editor/plugins/core/edumed/choice/choiceTrueOrFalse.js index 86fe809..bf1a9ea 100644 --- a/src/editor/plugins/core/edumed/choice/choiceTrueOrFalse.js +++ b/src/editor/plugins/core/edumed/choice/choiceTrueOrFalse.js @@ -14,7 +14,7 @@ var $ = require('libs/jquery'), var trueOrFalse = Object.create(choiceBase); _.extend(trueOrFalse, { type: 'true-or-false', - name: 'True or False', + name: gettext('True or False'), createListView: function(listNode) { return new ListView(this, listNode, { onItemViewAdded: function(itemView) { diff --git a/src/editor/plugins/core/edumed/elementBase.js b/src/editor/plugins/core/edumed/elementBase.js index ad7e0b8..9f87dd1 100644 --- a/src/editor/plugins/core/edumed/elementBase.js +++ b/src/editor/plugins/core/edumed/elementBase.js @@ -18,7 +18,7 @@ _.extend(choiceBase, { this.x = $('
    x
    '); this.x.on('click', function() { var dialog = Dialog.create({ - title: 'Removing exercise', + title: gettext('Removing exercise'), text: gettext('Do you really want to remove this exercise?'), executeButtonText: gettext('Yes'), cancelButtonText: gettext('No, don\'t do anything!') -- 2.20.1 From b16226e229b843fe0920d8ab00da40af79a1233b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Wed, 6 Aug 2014 15:17:46 +0200 Subject: [PATCH 05/16] editor: make toolbar icons more compact --- src/editor/modules/documentToolbar/documentToolbar.less | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/editor/modules/documentToolbar/documentToolbar.less b/src/editor/modules/documentToolbar/documentToolbar.less index 4b35b12..976fee4 100644 --- a/src/editor/modules/documentToolbar/documentToolbar.less +++ b/src/editor/modules/documentToolbar/documentToolbar.less @@ -26,10 +26,13 @@ .toolbar-widget { display: inline-block; - margin: 0 5px; + margin: 0; div { display: inline-block; } + .btn { + border-radius: 0; + } } } -- 2.20.1 From cecdda17fa90040f58f36ff0abcff0f7de1784df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Wed, 6 Aug 2014 15:47:54 +0200 Subject: [PATCH 06/16] editor: canvas - allow for resetting the container background --- src/editor/modules/documentCanvas/canvas/container.js | 2 ++ src/editor/modules/documentCanvas/canvas/container.less | 5 +++++ src/editor/modules/documentCanvas/documentCanvas.less | 1 + 3 files changed, 8 insertions(+) create mode 100644 src/editor/modules/documentCanvas/canvas/container.less diff --git a/src/editor/modules/documentCanvas/canvas/container.js b/src/editor/modules/documentCanvas/canvas/container.js index 069c78a..663a159 100644 --- a/src/editor/modules/documentCanvas/canvas/container.js +++ b/src/editor/modules/documentCanvas/canvas/container.js @@ -8,9 +8,11 @@ var $ = require('libs/jquery'), var Container = function(nodes, params, element) { + params = params || {}; _.extend(this, params); this.dom = this.dom || $('
    '); this.dom.addClass('canvas-container'); + this.dom.toggleClass('reset-background', !!params.resetBackground); this.element = element; nodes.forEach(function(node) { diff --git a/src/editor/modules/documentCanvas/canvas/container.less b/src/editor/modules/documentCanvas/canvas/container.less new file mode 100644 index 0000000..dc4a514 --- /dev/null +++ b/src/editor/modules/documentCanvas/canvas/container.less @@ -0,0 +1,5 @@ +.canvas-container { + .reset-background { + background-color: @white; + } +} diff --git a/src/editor/modules/documentCanvas/documentCanvas.less b/src/editor/modules/documentCanvas/documentCanvas.less index 3d335dc..9677691 100644 --- a/src/editor/modules/documentCanvas/documentCanvas.less +++ b/src/editor/modules/documentCanvas/documentCanvas.less @@ -1,5 +1,6 @@ @import 'nodes.less'; @import 'canvas/canvas.less'; +@import 'canvas/container.less'; @import 'canvas/documentElement.less'; @import 'canvas/genericElement.less'; @import 'canvas/gutter.less'; -- 2.20.1 From ac50cae92710f684c801ad933b924de2bec2b460 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Wed, 6 Aug 2014 16:03:16 +0200 Subject: [PATCH 07/16] editor: edumed exercises - visual tweaks --- src/editor/plugins/core/edumed/choice/choiceBase.js | 1 + src/editor/plugins/core/edumed/choice/list.js | 1 + src/editor/plugins/core/edumed/edumed.less | 3 ++- src/editor/plugins/core/edumed/gaps/element.js | 1 + src/editor/plugins/core/edumed/order/element.js | 1 + src/editor/plugins/core/edumed/order/order.less | 9 +++++++-- src/editor/plugins/core/edumed/order/view.js | 1 + src/editor/plugins/core/edumed/replace/element.js | 1 + 8 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/editor/plugins/core/edumed/choice/choiceBase.js b/src/editor/plugins/core/edumed/choice/choiceBase.js index eaf1c7c..aeafed4 100644 --- a/src/editor/plugins/core/edumed/choice/choiceBase.js +++ b/src/editor/plugins/core/edumed/choice/choiceBase.js @@ -16,6 +16,7 @@ _.extend(choiceBase, { this._container().append(this.view); this.createContainer(this.wlxmlNode.contents().filter(function(n) {return !n.is('list');}), { + resetBackground: true, manages: function(node, removedFrom) { if(node.is('list.orderable')) { return false; diff --git a/src/editor/plugins/core/edumed/choice/list.js b/src/editor/plugins/core/edumed/choice/list.js index e3fbd84..9174710 100644 --- a/src/editor/plugins/core/edumed/choice/list.js +++ b/src/editor/plugins/core/edumed/choice/list.js @@ -74,6 +74,7 @@ var ItemView = function(node, exerciseView) { this.dom = $(_.template(viewItemTemplate)()); this.container = exerciseView.element.createContainer(node.contents(), { + resetBackground: true, manages: function(node, originaParent) { return this.node.sameNode(node.parent() || originaParent); }.bind(this), diff --git a/src/editor/plugins/core/edumed/edumed.less b/src/editor/plugins/core/edumed/edumed.less index b78f792..fc79e39 100644 --- a/src/editor/plugins/core/edumed/edumed.less +++ b/src/editor/plugins/core/edumed/edumed.less @@ -4,7 +4,7 @@ @import 'choice/choice.less'; .edumed-exercise { - + background-color: @grayLighter; border: 1px lighten(#000, 35%) dashed; margin: 15px 0; padding: 10px; @@ -13,6 +13,7 @@ font-weight: bold; font-variant: small-caps; margin-bottom: 10px; + background-color: @grayLighter;; } .btn { diff --git a/src/editor/plugins/core/edumed/gaps/element.js b/src/editor/plugins/core/edumed/gaps/element.js index 294ac0a..db8d0c5 100644 --- a/src/editor/plugins/core/edumed/gaps/element.js +++ b/src/editor/plugins/core/edumed/gaps/element.js @@ -16,6 +16,7 @@ _.extend(OrderExerciceElement, { this._container().append(view); this.createContainer(this.wlxmlNode.contents(), { + resetBackground: true, manages: function() { return true; }, diff --git a/src/editor/plugins/core/edumed/order/element.js b/src/editor/plugins/core/edumed/order/element.js index b113199..a81155e 100644 --- a/src/editor/plugins/core/edumed/order/element.js +++ b/src/editor/plugins/core/edumed/order/element.js @@ -55,6 +55,7 @@ _.extend(OrderExerciceElement, { var exerciseNode = this.wlxmlNode; this.createContainer(this.wlxmlNode.object.getDescription(), { + resetBackground: true, manages: function(node, removedFrom) { if(node.is('list.orderable')) { return false; diff --git a/src/editor/plugins/core/edumed/order/order.less b/src/editor/plugins/core/edumed/order/order.less index b407259..67de8bc 100644 --- a/src/editor/plugins/core/edumed/order/order.less +++ b/src/editor/plugins/core/edumed/order/order.less @@ -1,3 +1,4 @@ +@exercise-order-gray: darken(#ddd, 15%); .exercise-order { overflow-x: hidden; @@ -29,7 +30,7 @@ vertical-align: middle; display: table-cell; width: 20px; - background-color: darken(#ddd, 15%); + background-color: @exercise-order-gray; text-align: center; border-radius: 0 5px 5px 0; padding: 10px 10px; @@ -43,7 +44,7 @@ .placeholder { height: 10px; transition: height 0.05s; - background-color: white; + background-color: transparent; &.active { height: 60px; transition: height 0.05s; @@ -63,4 +64,8 @@ opacity: 0.6; } } + + .nav-tabs > .active > a { + background-color: @exercise-order-gray; + } } \ No newline at end of file diff --git a/src/editor/plugins/core/edumed/order/view.js b/src/editor/plugins/core/edumed/order/view.js index 2b824cf..8905e7a 100644 --- a/src/editor/plugins/core/edumed/order/view.js +++ b/src/editor/plugins/core/edumed/order/view.js @@ -189,6 +189,7 @@ var ItemView = function(item, exerciseView) { var content = this.content; this.container = exerciseView.element.createContainer(item.node.contents(), { + resetBackground: true, manages: function(node, originaParent) { return item.node.sameNode(node.parent() || originaParent); }, diff --git a/src/editor/plugins/core/edumed/replace/element.js b/src/editor/plugins/core/edumed/replace/element.js index 128fe50..f4157d2 100644 --- a/src/editor/plugins/core/edumed/replace/element.js +++ b/src/editor/plugins/core/edumed/replace/element.js @@ -49,6 +49,7 @@ _.extend(ReplaceExerciseElement, { ); this.createContainer(this.wlxmlNode.contents(), { + resetBackground: true, manages: function() { return true; }, -- 2.20.1 From e9cf500f44f691af0d5529ebbef61c20059955c8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Wed, 6 Aug 2014 16:46:23 +0200 Subject: [PATCH 08/16] editor: fixing, refactoring, improving styling in choice exercises --- src/editor/plugins/core/edumed/choice/choice.less | 4 +++- .../plugins/core/edumed/choice/choiceMulti.less | 11 +++++++++++ src/editor/plugins/core/edumed/choice/choiceSingle.js | 2 +- .../plugins/core/edumed/choice/choiceSingle.less | 11 +++++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 src/editor/plugins/core/edumed/choice/choiceMulti.less create mode 100644 src/editor/plugins/core/edumed/choice/choiceSingle.less diff --git a/src/editor/plugins/core/edumed/choice/choice.less b/src/editor/plugins/core/edumed/choice/choice.less index fb99110..6a80f87 100644 --- a/src/editor/plugins/core/edumed/choice/choice.less +++ b/src/editor/plugins/core/edumed/choice/choice.less @@ -1 +1,3 @@ -@import 'choiceTrueOrFalse.less'; \ No newline at end of file +@import 'choiceTrueOrFalse.less'; +@import 'choiceSingle.less'; +@import 'choiceMulti.less'; \ No newline at end of file diff --git a/src/editor/plugins/core/edumed/choice/choiceMulti.less b/src/editor/plugins/core/edumed/choice/choiceMulti.less new file mode 100644 index 0000000..92877b2 --- /dev/null +++ b/src/editor/plugins/core/edumed/choice/choiceMulti.less @@ -0,0 +1,11 @@ +.exercise-multi { + input { + margin-right: 15px; + } + ul { + margin: 0; + } + li { + list-style-type: none; + } +} \ No newline at end of file diff --git a/src/editor/plugins/core/edumed/choice/choiceSingle.js b/src/editor/plugins/core/edumed/choice/choiceSingle.js index 6824d44..68ff576 100644 --- a/src/editor/plugins/core/edumed/choice/choiceSingle.js +++ b/src/editor/plugins/core/edumed/choice/choiceSingle.js @@ -44,7 +44,7 @@ _.extend(choiceSingle, { }); var RadioView = function(checked, name, onValueChange) { - this.dom = $('') + this.dom = $('') .attr('checked', checked) .attr('name', name); this.dom.on('change', function() { diff --git a/src/editor/plugins/core/edumed/choice/choiceSingle.less b/src/editor/plugins/core/edumed/choice/choiceSingle.less new file mode 100644 index 0000000..ddb9c96 --- /dev/null +++ b/src/editor/plugins/core/edumed/choice/choiceSingle.less @@ -0,0 +1,11 @@ +.exercise-single { + input { + margin-right: 15px; + } + ul { + margin: 0; + } + li { + list-style-type: none; + } +} \ No newline at end of file -- 2.20.1 From b130359b2adfef17da7cc477779a4b98cecadd49 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Thu, 7 Aug 2014 16:16:42 +0200 Subject: [PATCH 09/16] editor: finalizing exercise.order drag & drop mechanism --- src/editor/plugins/core/edumed/order/order.less | 11 +++++------ src/editor/plugins/core/edumed/order/view.js | 3 ++- src/editor/plugins/core/edumed/order/viewItem.html | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/editor/plugins/core/edumed/order/order.less b/src/editor/plugins/core/edumed/order/order.less index 67de8bc..e0c1b52 100644 --- a/src/editor/plugins/core/edumed/order/order.less +++ b/src/editor/plugins/core/edumed/order/order.less @@ -12,7 +12,6 @@ width: 100%; border-radius: 5px; background-color: #ddd; - -webkit-margin-before: -20px; // compensate for Chrome behavior for ol > li > table } .content { @@ -34,7 +33,6 @@ text-align: center; border-radius: 0 5px 5px 0; padding: 10px 10px; - pointer-events: none; .dragEnter { opacity: 0.5; @@ -54,11 +52,12 @@ width:100%; } - .placeholder-top { - margin-left: 25px; + ol { + margin: 0; + counter-reset: edumed-order-counter; } - - li { + ol li { + list-style-type: none; cursor: move; .dragged { opacity: 0.6; diff --git a/src/editor/plugins/core/edumed/order/view.js b/src/editor/plugins/core/edumed/order/view.js index 8905e7a..a90ded4 100644 --- a/src/editor/plugins/core/edumed/order/view.js +++ b/src/editor/plugins/core/edumed/order/view.js @@ -82,6 +82,7 @@ var OrderExerciseView = function(element) { this.trigger(this.mode === 'initial' ? 'moveItem' : 'moveAnswer', droppedItem.item, first.item, 'before'); dropTargets.removeClass('active'); + e.preventDefault(); }.bind(this)); }; _.extend(OrderExerciseView.prototype, Backbone.Events, { @@ -150,7 +151,7 @@ var ItemView = function(item, exerciseView) { var dropTargets = this.dom.find('.placeholder'), - dragSources = this.dom.find('.wrapper'); + dragSources = this.dom.find('.handle'); dragSources.on('dragstart', function(e) { this.dom.addClass('dragged'); diff --git a/src/editor/plugins/core/edumed/order/viewItem.html b/src/editor/plugins/core/edumed/order/viewItem.html index 1e9b1b1..33e242a 100644 --- a/src/editor/plugins/core/edumed/order/viewItem.html +++ b/src/editor/plugins/core/edumed/order/viewItem.html @@ -1,9 +1,9 @@
  • -
    -
    -
    +
    +
    +
    • \ No newline at end of file -- 2.20.1 From 01d1e8189bc059336dc51d80815823f91cbb24a6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Thu, 7 Aug 2014 16:17:25 +0200 Subject: [PATCH 10/16] smartxml: TextNode.split indicates which of the two return nodes is actually a new one --- src/smartxml/core.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/smartxml/core.js b/src/smartxml/core.js index 6329491..b60bc2e 100644 --- a/src/smartxml/core.js +++ b/src/smartxml/core.js @@ -359,7 +359,7 @@ var textNodeTransformations = { newElement.prepend({text: suffix}); } - return {first: parentElement, second: newElement}; + return {first: parentElement, second: newElement, created: newElement}; }, divideWithElementNode: function(node, params) { -- 2.20.1 From 314bc2164ef9e9b94bd57eba48211e5df6002bf1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Thu, 7 Aug 2014 16:18:38 +0200 Subject: [PATCH 11/16] editor: temporary fix for invalid answer values in new exercise.order items --- src/editor/plugins/core/core.js | 36 +++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/editor/plugins/core/core.js b/src/editor/plugins/core/core.js index 3921635..31ac09d 100644 --- a/src/editor/plugins/core/core.js +++ b/src/editor/plugins/core/core.js @@ -15,6 +15,27 @@ var _ = require('libs/underscore'), edumed = require('plugins/core/edumed/edumed'); +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 +59,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); }); -- 2.20.1 From 248bc3fefa3eed44a6ffed7374bea9310962fb88 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Thu, 7 Aug 2014 16:44:44 +0200 Subject: [PATCH 12/16] edtior: fix exercise.order document events handling --- src/editor/plugins/core/edumed/order/element.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/editor/plugins/core/edumed/order/element.js b/src/editor/plugins/core/edumed/order/element.js index a81155e..724f2ec 100644 --- a/src/editor/plugins/core/edumed/order/element.js +++ b/src/editor/plugins/core/edumed/order/element.js @@ -57,7 +57,7 @@ _.extend(OrderExerciceElement, { this.createContainer(this.wlxmlNode.object.getDescription(), { resetBackground: true, manages: function(node, removedFrom) { - if(node.is('list.orderable')) { + if(node.is('list.orderable') || (removedFrom && removedFrom.is('list.orderable'))) { return false; } return exerciseNode.sameNode(node.parent() || removedFrom); //!n.hasFollowingSibing(this.params.listnode); @@ -79,6 +79,12 @@ _.extend(OrderExerciceElement, { this.reloadView(); } }, + onNodeDetached: function(event) { + var node = event.meta.node; + if(node.is('item.answer') && event.meta.parent && event.meta.parent.is('list.orderable')) { + this.reloadView(); + } + }, reloadView: function() { this.view.clearItems(); this.wlxmlNode.object.getItems().forEach(function(item) { -- 2.20.1 From e10030e66aab8b55dab8b8ba507a9140243129fa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Fri, 8 Aug 2014 10:42:31 +0200 Subject: [PATCH 13/16] wlxml: helper functions related to context root --- src/wlxml/wlxml.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js index 40ab196..ef70d3d 100644 --- a/src/wlxml/wlxml.js +++ b/src/wlxml/wlxml.js @@ -44,6 +44,19 @@ var WLXMLDocumentNodeMethods = { } }.bind(this)); return toret; + }, + getContextRoot: function() { + var contextRoot; + [this].concat(this.parents()).some(function(n) { + if(n.isContextRoot()) { + contextRoot = n; + return true; + } + }); + return contextRoot; + }, + hasSameContextRoot: function(other) { + return this.getContextRoot().sameNode(other.getContextRoot()); } }; @@ -183,7 +196,6 @@ var WLXMLDocumentNode = function() { }; WLXMLDocumentNode.prototype = Object.create(smartxml.DocumentNode.prototype); - var WLXMLTextNode = function() { smartxml.TextNode.apply(this, arguments); }; -- 2.20.1 From bf5ebc6402774afb306abcc8af78749ce5178e7e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Fri, 8 Aug 2014 10:54:56 +0200 Subject: [PATCH 14/16] editor: prevent list action from operating across context root boundries --- .../modules/documentCanvas/canvas/selection.js | 16 ++++++++++++---- src/editor/plugins/core/lists.js | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/editor/modules/documentCanvas/canvas/selection.js b/src/editor/modules/documentCanvas/canvas/selection.js index e072050..0d8c4ce 100644 --- a/src/editor/modules/documentCanvas/canvas/selection.js +++ b/src/editor/modules/documentCanvas/canvas/selection.js @@ -60,7 +60,8 @@ $.extend(TextSelection.prototype, { toDocumentFragment: function() { var doc = this.canvas.wlxmlDocument, anchorNode = this.anchorElement ? this.anchorElement.wlxmlNode : null, - focusNode = this.focusElement ? this.focusElement.wlxmlNode : null; + focusNode = this.focusElement ? this.focusElement.wlxmlNode : null, + node1, node2; if(!anchorNode || !focusNode) { return; @@ -75,10 +76,17 @@ $.extend(TextSelection.prototype, { }); } else { - var siblingParents = doc.getSiblingParents({node1: anchorNode, node2: focusNode}); + if(anchorNode.hasSameContextRoot(focusNode)) { + var siblingParents = doc.getSiblingParents({node1: anchorNode, node2: focusNode}); + node1 = siblingParents.node1; + node2 = siblingParents.node2; + } else { + node1 = focusNode; + node2 = anchorNode; + } return doc.createFragment(doc.RangeFragment, { - node1: siblingParents.node1, - node2: siblingParents.node2 + node1: node1, + node2: node2 }); } }, diff --git a/src/editor/plugins/core/lists.js b/src/editor/plugins/core/lists.js index c6de730..65b6e69 100644 --- a/src/editor/plugins/core/lists.js +++ b/src/editor/plugins/core/lists.js @@ -8,7 +8,7 @@ var getBoundriesForAList = function(fragment) { var node; if(fragment instanceof fragment.RangeFragment && fragment.hasSiblingBoundries()) { - return fragment.boundriesSiblingParents(); + return fragment.startNode.hasSameContextRoot(fragment.endNode) && fragment.boundriesSiblingParents(); } if(fragment instanceof fragment.NodeFragment) { node = fragment.node.getNearestElementNode(); @@ -156,7 +156,7 @@ var toggleListAction = function(type) { } var boundries = getBoundriesForAList(params.fragment); - if(boundries) { + if(boundries && boundries.node1.hasSameContextRoot(boundries.node2)) { return { allowed: true, description: interpolate(gettext('Make %s fragment(s) into list'), [countItems(getBoundriesForAList(params.fragment))]), -- 2.20.1 From 6473eb47e2b1b17a3935cbfae451199123607bc9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Fri, 8 Aug 2014 11:13:44 +0200 Subject: [PATCH 15/16] wlxml: turn extracted list items into paragraphs instead of generic blocks --- src/wlxml/extensions/list/list.js | 6 +++--- src/wlxml/extensions/list/list.test.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wlxml/extensions/list/list.js b/src/wlxml/extensions/list/list.js index 7731616..8d88115 100644 --- a/src/wlxml/extensions/list/list.js +++ b/src/wlxml/extensions/list/list.js @@ -133,7 +133,7 @@ extension.document.transformations.extractItems = { reference.after(item); reference = item; if(!listIsNested) { - item.setClass(''); + item.setClass('p'); } }); if(precedingItems.length === 0) { @@ -143,14 +143,14 @@ extension.document.transformations.extractItems = { extractedItems.forEach(function(item) { reference.before(item); if(!listIsNested) { - item.setClass(''); + item.setClass('p'); } }); } else { extractedItems.forEach(function(item) { reference.after(item); if(!listIsNested) { - item.setClass(''); + item.setClass('p'); } reference = item; }); diff --git a/src/wlxml/extensions/list/list.test.js b/src/wlxml/extensions/list/list.test.js index 2d47778..277e828 100644 --- a/src/wlxml/extensions/list/list.test.js +++ b/src/wlxml/extensions/list/list.test.js @@ -136,10 +136,10 @@ describe('Lists extension', function() { expect(list1.contents()[0].contents()[0].getText()).to.equal('0', 'first item of the first list is a first item of the original list'); expect(oldItem1.contents()[0].getText()).to.equal('1', 'first item got extracted'); - expect(oldItem1.getClass() === '').to.equal(true, 'first extracted element has no wlxml class'); + expect(oldItem1.getClass() === 'p').to.equal(true, 'first extracted element became a paragraph'); expect(oldItem2.contents()[0].getText()).to.equal('2', 'second item got extracted'); - expect(oldItem2.getClass() === '').to.equal(true, 'second extracted element has no wlxml class'); + expect(oldItem2.getClass() === 'p').to.equal(true, 'second extracted element became a paragraph'); expect(list2.is('list')).to.equal(true, 'last section child is a list'); expect(list2.contents().length).to.equal(1, 'second list has one child'); @@ -414,7 +414,7 @@ describe('Lists extension', function() { expect(sectionContents[0].is('list')).to.equal(true, 'first child is a list'); expect(extractedItem.getTagName()).to.equal('div', 'extracted item is a wlxml div'); - expect(extractedItem.getClass()).to.equal('', 'extracted item has no wlxml class'); + expect(extractedItem.getClass()).to.equal('p', 'extracted item became a paragraph'); expect(extractedItem.contents()[0].getText()).to.equal('1.1', 'extracted item ok'); expect(sectionContents[2].is('list')).to.equal(true, 'second child is a list'); }); -- 2.20.1 From 4aeab46723e464d604ced64f9bddb8fa0921df5a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Fri, 8 Aug 2014 11:31:15 +0200 Subject: [PATCH 16/16] editor: canvas - block merging at the boundries of a context root --- src/editor/modules/documentCanvas/canvas/keyboard.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/editor/modules/documentCanvas/canvas/keyboard.js b/src/editor/modules/documentCanvas/canvas/keyboard.js index d8052ed..e43ea89 100644 --- a/src/editor/modules/documentCanvas/canvas/keyboard.js +++ b/src/editor/modules/documentCanvas/canvas/keyboard.js @@ -257,6 +257,14 @@ var keyEventHandlers = [ return; } + + var parent = element.wlxmlNode.parent(); + if(element.wlxmlNode.getIndex() === 0 && parent.isContextRoot() && (!parent.is('item') || parent.getIndex() === 0)) { + // Don't even try to do anything at the edge of a context root, except for non-first items + // - this is a temporary solution until key events handling get refactored into something more sane. + return; + } + e.preventDefault(); s.canvas.wlxmlDocument.transaction(function() { -- 2.20.1