Feature/tdr 10 upgrade jquery

manifest.php

@@ -34,11 +34,11 @@
     'name'        => 'taoQtiItem',
     'label'       => 'QTI item model',
     'license'     => 'GPL-2.0',
-    'version'     => '23.0.4',
+    'version'     => '23.1.0',
     'author'      => 'Open Assessment Technologies',
     'requires' => array(
         'taoItems' => '>=10.1.0',
-        'tao'      => '>=40.3.0',
+        'tao'      => '>=40.4.0',
         'generis'  => '>=12.5.0',
     ),
     'models' => array(

scripts/update/Updater.php

@@ -438,6 +438,6 @@ public function update($initialVersion){
             $this->setVersion('21.0.0');
         }
 
-        $this->skip('21.0.0', '23.0.4');
+        $this->skip('21.0.0', '23.1.0');
     }
 }

test/integration/portableElement/samples/pciDir040/creator/widget/states/Answer.js

@@ -7,9 +7,9 @@ define([
     'use strict';
 
     var InteractionStateAnswer = stateFactory.extend(Answer, function initAnswerState(){
-        this.widget.$original.find('.likert input').prop('disabled', 'disabled');
+        this.widget.$original.find('.likert input').prop('disabled', true);
     }, function exitAnswerState(){
-        this.widget.$original.find('.likert input').removeProp('disabled');
+        this.widget.$original.find('.likert input').prop('disabled', false);
     });
 
     InteractionStateAnswer.prototype.initResponseForm = function initResponseForm(){
@@ -18,4 +18,4 @@ define([
     };
 
     return InteractionStateAnswer;
-});
+});

test/integration/portableElement/samples/pciDir041/creator/widget/states/Answer.js

@@ -7,9 +7,9 @@ define([
     'use strict';
 
     var InteractionStateAnswer = stateFactory.extend(Answer, function initAnswerState(){
-        this.widget.$original.find('.likert input').prop('disabled', 'disabled');
+        this.widget.$original.find('.likert input').prop('disabled', true);
     }, function exitAnswerState(){
-        this.widget.$original.find('.likert input').removeProp('disabled');
+        this.widget.$original.find('.likert input').prop('disabled', false);
     });
 
     InteractionStateAnswer.prototype.initResponseForm = function initResponseForm(){
@@ -18,4 +18,4 @@ define([
     };
 
     return InteractionStateAnswer;
-});
+});

views/js/qtiCreator/plugins/menu/preview.js

@@ -105,7 +105,7 @@ define([
          * Enable the button
          */
         enable : function enable (){
-            this.$element.removeProp('disabled')
+            this.$element.prop('disabled', false)
                          .removeClass('disabled');
         },
 

views/js/qtiCreator/plugins/menu/print.js

@@ -99,7 +99,7 @@ define([
          * Enable the button
          */
         enable : function enable (){
-            this.$element.removeProp('disabled')
+            this.$element.prop('disabled', false)
                          .removeClass('disabled');
         },
 

views/js/qtiCreator/plugins/menu/save.js

@@ -88,7 +88,7 @@ define([
          * Enable the button
          */
         enable : function enable (){
-            this.$element.removeProp('disabled')
+            this.$element.prop('disabled', false)
                          .removeClass('disabled');
         },
 

views/js/qtiCreator/plugins/navigation/back.js

@@ -85,7 +85,7 @@ define([
          * Enable the button
          */
         enable : function enable (){
-            this.$element.removeProp('disabled')
+            this.$element.prop('disabled', false)
                          .removeClass('disabled');
         },
 

views/js/qtiCreator/widgets/interactions/helpers/pairScoringForm.js

@@ -184,7 +184,7 @@ define([
                 var currentLeft = $left.select2('val'),
                     currentRight = $right.select2('val');
 
-                $options.removeProp('disabled');
+                $options.prop('disabled', false);
 
                 _(pairs).where({leftId : currentLeft}).forEach(function(pair){
                     $right.find('option[value="' + pair.rightId+ '"]').prop('disabled', true);
@@ -202,7 +202,7 @@ define([
                 var currentRight = $right.select2('val'),
                     currentLeft = $left.select2('val');
 
-                $options.removeProp('disabled');
+                $options.prop('disabled', false);
 
                 _(pairs).where({rightId : currentRight}).forEach(function(pair){
                     $left.find('option[value="' + pair.leftId+ '"]').prop('disabled', true);
@@ -223,7 +223,7 @@ define([
                 var lval = $left.select2('val');
                 var rval = $right.select2('val');
 
-                $options.removeProp('disabled');
+                $options.prop('disabled', false);
                 e.preventDefault();
 
                 if(lval && rval){

views/js/qtiCreator/widgets/interactions/hottextInteraction/states/Correct.js

@@ -36,15 +36,15 @@ define([
         var response = interaction.getResponseDeclaration();
 
         //enable the checkbox to enable user selection
-        this.widget.$original.find('.hottext-checkmark > input').removeProp('disabled');
+        this.widget.$original.find('.hottext-checkmark > input').prop('disabled', false);
 
         //really need to destroy before ?
         commonRenderer.resetResponse(interaction);
         commonRenderer.destroy(interaction);
-        
+
         //add a specific instruction
         instructionMgr.appendInstruction(interaction, __('Please select the correct hottext choices below.'));
-        
+
         //use the common Renderer
         commonRenderer.render.call(interaction.getRenderer(), interaction);
 

views/js/qtiCreator/widgets/interactions/matchInteraction/ResponseWidget.js

@@ -49,7 +49,7 @@ define([
             commonRenderer.render(interaction);
 
             widget.$container.find('table.matrix input[type=checkbox]')
-                .removeProp('disabled')
+                .prop('disabled', false)
                 .attr('data-edit', 'correct')
                 .attr('data-role', 'correct');
         },

views/js/qtiCreator/widgets/interactions/matchInteraction/states/Map.js

@@ -17,13 +17,13 @@ define([
 
         //finally, apply defined correct response and response mapping:
         responseWidget.setResponse(interaction, _.values(response.getCorrect()));
-        
-       //change the correct state 
+
+       //change the correct state
        _widget.on('metaChange', function(meta){
             if(meta.key === 'defineCorrect'){
                 if(meta.value){
                     $('.match-interaction-area input[type="checkbox"]', _widget.$container)
-                        .removeProp('disabled') 
+                        .prop('disabled', false)
                         .removeClass('disabled');
                 } else {
                     $('.match-interaction-area input[type="checkbox"]', _widget.$container)
@@ -44,4 +44,4 @@ define([
     });
 
     return MatchInteractionStateMap;
-});
+});

views/package.json

@@ -8,7 +8,7 @@
     "url": "git+https://github.com/oat-sa/extension-tao-itemqti.git"
   },
   "dependencies": {
-    "@oat-sa/tao-item-runner": "0.4.0",
-    "@oat-sa/tao-item-runner-qti": "0.4.13"
+    "@oat-sa/tao-item-runner": "oat-sa/tao-item-runner-fe#breaking/TDR-10_upgrade-jquery",
+    "@oat-sa/tao-item-runner-qti": "oat-sa/tao-item-runner-qti-fe#breaking/TDR-10_upgrade-jquery"
   }
 }