Merge pull request #19 from oat-sa/release-1.2.0

Release 1.2.0
oat-sa · Sep 28, 2016 · c0527b6 · c0527b6
2 parents 2f96db3 + b0e1409
commit c0527b6
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 25 deletions.
diff --git a/manifest.php b/manifest.php
@@ -25,7 +25,7 @@
 	'label' => 'QTI PCI samples',
 	'description' => '',
     'license' => 'GPL-2.0',
-    'version' => '1.1.1',
+    'version' => '1.2.0',
 	'author' => 'Open Assessment Technologies',
 	'requires' => array(
 	    'qtiItemPci' => '>=1.0.0',
@@ -61,4 +61,4 @@
 	    #BASE WWW required by JS
 	    'BASE_WWW' => ROOT_URL.'pciSamples/views/'
 	)
-);
+);
diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -27,39 +27,44 @@
 class Updater extends \common_ext_ExtensionUpdater
 {
 
-	/**
+    /**
      *
      * @param string $currentVersion
      * @return string $versionUpdatedTo
      */
-    public function update($initialVersion) {
+    public function update($initialVersion) 
+    {
 
+        if ($this->isBetween('0', '0.2.1')) {
+            $this->setVersion('0.2.1');
+        }
 
-		if ($this->isBetween('0', '0.2.1')) {
-			$this->setVersion('0.2.1');
-		}
-
-		if($this->isVersion('0.2.1')){
-			$registerPci = new RegisterPci();
-			$registerPci([]);
+        if ($this->isVersion('0.2.1')) {
+            $registerPci = new RegisterPci();
+            $registerPci([]);
 
-			HookRegistry::getRegistry()->remove('pciSamplesCreator');
+            HookRegistry::getRegistry()->remove('pciSamplesCreator');
 
-			$this->setVersion('1.0.0');
-		}
+            $this->setVersion('1.0.0');
+        }
 
-		$this->skip('1.0.0', '1.0.1');
+        $this->skip('1.0.0', '1.0.1');
 
-		if($this->isVersion('1.0.1')){
-			call_user_func(new RegisterPci(), []);
-			$this->setVersion('1.0.2');
-		}
+        if ($this->isVersion('1.0.1')) {
+            call_user_func(new RegisterPci(), []);
+            $this->setVersion('1.0.2');
+        }
 
-        if($this->isVersion('1.0.2')){
+        if ($this->isVersion('1.0.2')) {
             call_user_func(new RegisterPci(), []);
             $this->setVersion('1.1.0');
         }
 
         $this->skip('1.1.0', '1.1.1');
-	}
-}
+
+        if ($this->isVersion('1.1.1')) {
+            call_user_func(new RegisterPci(), []);
+            $this->setVersion('1.2.0');
+        }
+    }
+}
diff --git a/views/js/pciCreator/dev/textReaderInteraction/creator/widget/states/Question.js b/views/js/pciCreator/dev/textReaderInteraction/creator/widget/states/Question.js
@@ -307,7 +307,8 @@ define([
                         },
                         markup : interaction.properties.pages[pageIndex].content[colIndex],
                         related : interaction,
-                        colIndex : colIndex
+                        colIndex : colIndex,
+                        highlight: true
                     });
 
                     $editor.on('editorready', function() {

diff --git a/views/js/pciCreator/dev/textReaderInteraction/pciCreator.json b/views/js/pciCreator/dev/textReaderInteraction/pciCreator.json
@@ -2,7 +2,7 @@
     "typeIdentifier": "textReaderInteraction",
     "label": "Text reader",
     "description": "The Paging widget combines a scrolling widget with additional paging controls.",
-    "version": "0.3.1",
+    "version": "0.4.0",
     "author": "Aleh Hutnikau",
     "email": "contact@taotesting.com",
     "tags": [
@@ -50,4 +50,4 @@
             "./creator/css/userTooltips.css"
         ]
     }
-}
+}