Merge pull request #187 from oat-sa/release-6.4.1

Release 6.4.1
oat-sa · Sep 12, 2017 · 02c747f · 02c747f
2 parents 685d537 + 38e67d4
commit 02c747f
Show file tree

Hide file tree

Showing 4 changed files with 177 additions and 221 deletions.
diff --git a/manifest.php b/manifest.php
@@ -34,7 +34,7 @@
     'label' => 'Test core extension',
     'description' => 'TAO Tests extension contains the abstraction of the test-runners, but requires an implementation in order to be able to run tests',
     'license' => 'GPL-2.0',
-    'version' => '6.4.0',
+    'version' => '6.4.1',
     'author' => 'Open Assessment Technologies, CRP Henri Tudor',
     'requires' => array(
         'taoItems' => '>=2.20.1',

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -88,6 +88,6 @@ public function update($initialVersion)
             $this->setVersion('6.0.1');
         }
 
-        $this->skip('6.0.1', '6.4.0');
+        $this->skip('6.0.1', '6.4.1');
 	}
 }
diff --git a/views/js/runner/runner.js b/views/js/runner/runner.js
@@ -117,7 +117,7 @@ define([
             var args = [].slice.call(arguments, 1);
             return new Promise(function(resolve){
                 if(!_.isFunction(provider[method])){
-                   return resolve();
+                    return resolve();
                 }
                 return resolve(provider[method].apply(runner, args));
             });
@@ -184,8 +184,11 @@ define([
                     .then(_.partial(pluginRun, 'init'))
                     .then(function() {
                         self.setState('init', true)
-                            .trigger('init')
-                            .render();
+                            .off('init.internal')
+                            .after('init.internal', function initDone(){
+                                this.render();
+                            })
+                            .trigger('init');
                     })
                     .catch(reportError);
 
@@ -227,8 +230,11 @@ define([
 
                 providerRun('loadItem', itemRef).then(function(itemData){
                     self.setItemState(itemRef, 'loaded', true)
-                        .trigger('loaditem', itemRef, itemData)
-                        .renderItem(itemRef, itemData);
+                        .off('loaditem.internal')
+                        .after('loaditem.internal', function loadItemDone(){
+                            this.renderItem(itemRef, itemData);
+                        })
+                        .trigger('loaditem', itemRef, itemData);
                 }).catch(reportError);
                 return this;
             },
@@ -484,11 +490,10 @@ define([
              * @returns {Boolean} if active, false if not set
              */
             getPersistentState : function getPersistentState(name) {
-                var getPersistentState = provider.getPersistentState;
                 var state;
 
-                if(_.isFunction(getPersistentState)){
-                    state = getPersistentState.call(runner, name);
+                if(_.isFunction(provider.getPersistentState)){
+                    state = provider.getPersistentState.call(runner, name);
                 }
 
                 return !!state;
@@ -727,6 +732,6 @@ define([
         if(!_.isFunction(provider.loadAreaBroker)){
             throw new TypeError('The runner provider MUST have a method that returns an areaBroker');
         }
-       return true;
+        return true;
     });
 });