January release

Woo, lots of changes here! Lots of tests, and optimised JS! As always follow along at https://github.com/gormster/moodle/tree/MOODLE_31_STABLE_teameval for up-to-the-minute development.
gormster · Jan 11, 2017 · cdbf9a9 · cdbf9a9
1 parent 2459d87
commit cdbf9a9
Show file tree

Hide file tree

Showing 33 changed files with 910 additions and 95 deletions.
diff --git a/local/teameval/amd/build/addquestion.min.js b/local/teameval/amd/build/addquestion.min.js
diff --git a/local/teameval/amd/build/ajaxforms.min.js b/local/teameval/amd/build/ajaxforms.min.js
diff --git a/local/teameval/amd/build/collapsible.min.js b/local/teameval/amd/build/collapsible.min.js
diff --git a/local/teameval/amd/build/developer.min.js b/local/teameval/amd/build/developer.min.js
diff --git a/local/teameval/amd/build/formparse.min.js b/local/teameval/amd/build/formparse.min.js
diff --git a/local/teameval/amd/build/langen.min.js b/local/teameval/amd/build/langen.min.js
diff --git a/local/teameval/amd/build/question.min.js b/local/teameval/amd/build/question.min.js
diff --git a/local/teameval/amd/build/submitquestion.min.js b/local/teameval/amd/build/submitquestion.min.js
diff --git a/local/teameval/amd/build/switch.min.js b/local/teameval/amd/build/switch.min.js
diff --git a/local/teameval/amd/build/tabs.min.js b/local/teameval/amd/build/tabs.min.js
diff --git a/local/teameval/amd/src/addquestion.js b/local/teameval/amd/src/addquestion.js
@@ -65,7 +65,7 @@ define(['jquery', 'jqueryui', 'core/str', 'core/templates', 'core/ajax', 'core/n
                 if ($(evt.target).closest('.local-teameval-question-dropdown').length > 0) {
                     var type = $(evt.target).closest('li').data('type');
                     _this.addQuestion(type).done(function(question) {
-                        _this.editQuestion(question, true);
+                        _this.editQuestion(question);
                     });
                 }
                 dropdown.remove();
@@ -141,7 +141,7 @@ define(['jquery', 'jqueryui', 'core/str', 'core/templates', 'core/ajax', 'core/n
             });
         },
 
-        editQuestion: function(question, newquestion) {
+        editQuestion: function(question) {
 
             // hide the action bar
             question.find('.local-teameval-question-actions').hide();

diff --git a/local/teameval/amd/src/developer.js b/local/teameval/amd/src/developer.js
@@ -19,6 +19,22 @@ define(['jquery', 'local_teameval/langen'], function($, LanGen) { return {
                 $(this).val(LanGen.generateSentence());
             });
 
+            $('.teamevalquestion-split100').closest('.question-container').each(function() {
+                var qObject = $(this).data('question');
+                var sizes = qObject.sizes;
+                sizes = sizes.map(function() {
+                    return Math.random();
+                });
+                var total = sizes.reduce(function(a, b) {
+                    return a + b;
+                });
+                sizes = sizes.map(function(v) {
+                    return parseInt(v / total * 100);
+                });
+                qObject.sizes = sizes;
+                qObject.updateView();
+            });
+
         });
 
         $('.local-teameval-developer-buttons').append(randomiseButton);

diff --git a/local/teameval/amd/src/formparse.js b/local/teameval/amd/src/formparse.js
@@ -12,7 +12,7 @@ define(['jquery'], function($) {
             path.push(m[1]);
             if (m[2]) {
                 var x;
-                while(x = b.exec(m[2])) {
+                while((x = b.exec(m[2]))) {
                     path.push(x[1]);
                 }
             }
@@ -23,14 +23,14 @@ define(['jquery'], function($) {
     function setValue(obj, path, value) {
         var key = path.shift();
         if (path.length > 0) {
-            if (key == '' || !obj[key]) {
+            if (key === '' || !obj[key]) {
                 var nextKey = path[0];
                 var newVal = {};
-                if ((nextKey == '') || (parseInt(nextKey) == nextKey)) { //nextKey is an integer
+                if ((nextKey === '') || (parseInt(nextKey) == nextKey)) { //nextKey is an integer
                     newVal = [];
                 }
                 setValue(newVal, path, value);
-                if (key == '') {
+                if (key === '') {
                     obj.push(newVal);
                 } else {
                     obj[key] = newVal;
@@ -39,7 +39,7 @@ define(['jquery'], function($) {
                 setValue(obj[key], path, value);
             }
         } else {
-            if (key == '') {
+            if (key === '') {
                 obj.push(value);
             } else {
                 obj[key] = value;