Merge pull request #49 from oat-sa/release-1.4.0

Release 1.4.0
oat-sa · Dec 2, 2016 · 0a3d575 · 0a3d575
2 parents af3ea12 + 6c20f1b
commit 0a3d575
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 6 deletions.
diff --git a/manifest.php b/manifest.php
@@ -31,7 +31,7 @@
     'label' => 'QTI Portable Custom Interaction',
     'description' => '',
     'license' => 'GPL-2.0',
-    'version' => '1.3.0',
+    'version' => '1.4.0',
     'author' => 'Open Assessment Technologies SA',
     'requires' => array(
         'taoQtiItem' => '>=5.13.0'

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -87,5 +87,10 @@ public function update($currentVersion)
             call_user_func(new RegisterPciMathEntry(), ['0.2.0']);
             $this->setVersion('1.3.0');
         }
+
+        if($this->isVersion('1.3.0')){
+            call_user_func(new RegisterPciMathEntry(), ['0.3.0']);
+            $this->setVersion('1.4.0');
+        }
     }
 }
diff --git a/views/js/pciCreator/dev/mathEntryInteraction/creator/tpl/propertiesForm.tpl b/views/js/pciCreator/dev/mathEntryInteraction/creator/tpl/propertiesForm.tpl
@@ -19,6 +19,13 @@
         <span class="icon-checkbox"></span>
         {{__ "authorize white space"}}
     </label>
+    <label class="panel">
+        <input name="allowNewLine" type="checkbox" {{#if allowNewLine}}checked="checked"{{/if}}/>
+        <span class="icon-checkbox"></span>
+        <span class="txt-error"><strong>{{__ "EXPERIMENTAL ONLY: "}}</strong></span>
+        <br />allow line break
+
+    </label>
 </div>
 <hr />
 

diff --git a/views/js/pciCreator/dev/mathEntryInteraction/creator/widget/states/Question.js b/views/js/pciCreator/dev/mathEntryInteraction/creator/widget/states/Question.js
@@ -93,6 +93,7 @@ define([
             tool_gte:       toBoolean(interaction.prop('tool_gte'),     true),
             tool_times:     toBoolean(interaction.prop('tool_times'),   true),
             tool_divide:    toBoolean(interaction.prop('tool_divide'),  true),
+            allowNewLine:           toBoolean(interaction.prop('allowNewLine'),  false),
             authorizeWhiteSpace:    toBoolean(interaction.prop('authorizeWhiteSpace'),  false)
         }));
 
@@ -118,6 +119,7 @@ define([
             tool_gte:       configChangeCallBack,
             tool_times:     configChangeCallBack,
             tool_divide:    configChangeCallBack,
+            allowNewLine:           configChangeCallBack,
             authorizeWhiteSpace:    configChangeCallBack
         });
     };

diff --git a/views/js/pciCreator/dev/mathEntryInteraction/pciCreator.json b/views/js/pciCreator/dev/mathEntryInteraction/pciCreator.json
@@ -3,7 +3,7 @@
     "label": "Math entry",
     "short": "Math entry",
     "description": "Allow test taker to type math formulas",
-    "version": "0.2.0",
+    "version": "0.3.0",
     "author": "Christophe Noël",
     "email": "christophe@taotesting.com",
     "tags": [

diff --git a/views/js/pciCreator/dev/mathEntryInteraction/runtime/css/mathEntryInteraction.css b/views/js/pciCreator/dev/mathEntryInteraction/runtime/css/mathEntryInteraction.css
diff --git a/views/js/pciCreator/dev/mathEntryInteraction/runtime/css/mathEntryInteraction.css.map b/views/js/pciCreator/dev/mathEntryInteraction/runtime/css/mathEntryInteraction.css.map
diff --git a/views/js/pciCreator/dev/mathEntryInteraction/runtime/mathEntryInteraction.js b/views/js/pciCreator/dev/mathEntryInteraction/runtime/mathEntryInteraction.js
@@ -76,9 +76,10 @@ define([
                     lte:    toBoolean(config.tool_lte,      true),
                     gte:    toBoolean(config.tool_gte,      true),
                     times:  toBoolean(config.tool_times,    true),
-                    divide: toBoolean(config.tool_divide,   true)
+                    divide: toBoolean(config.tool_divide,   true),
                 },
-                authorizeWhiteSpace : toBoolean(config.authorizeWhiteSpace,   false)
+                allowNewLine:           toBoolean(config.allowNewLine,  false),
+                authorizeWhiteSpace:    toBoolean(config.authorizeWhiteSpace,   false)
             };
         },
 
@@ -208,6 +209,13 @@ define([
 
                 self.mathField.focus();
             });
+
+            this.$input.on('keypress.qtiCommonRenderer', function (e) {
+                var latex = '\\textcolor{black}{\\text{}}';
+                if (self.config.allowNewLine && e.keyCode === 13) {
+                    self.mathField.write(latex);
+                }
+            });
         },
 
 
@@ -294,6 +302,7 @@ define([
          */
         destroy: function destroy() {
             this.$toolbar.off('mousedown.qtiCommonRenderer');
+            this.$input.off('keypress.qtiCommonRenderer');
             this.resetResponse();
             this.mathField.revert();
         },

diff --git a/views/js/pciCreator/dev/mathEntryInteraction/runtime/scss/mathEntryInteraction.scss b/views/js/pciCreator/dev/mathEntryInteraction/runtime/scss/mathEntryInteraction.scss
@@ -76,6 +76,11 @@ $buttonFont: "Times New Roman", Times, serif;
 
     }
 
+    // hack for newline
+    .mq-textcolor .mq-text-mode {
+      display: block;
+    }
+
   }
 }