Fix for #38

cgkineo · Oct 23, 2019 · 04d6c1c · oliverfoster · Oct 23, 2019 · chris-steele
1 parent a3f4756
commit 04d6c1c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/bower.json b/bower.json
@@ -5,7 +5,7 @@
         "url": "git://github.com/cgkineo/adapt-devtools"
     },
     "framework": ">=2.2.0",
-    "version": "2.1.24",
+    "version": "2.1.25",
     "homepage": "https://github.com/cgkineo/adapt-devtools",
     "issues": "https://github.com/cgkineo/adapt-devtools/issues/",
     "displayName": "Developer tools",

diff --git a/js/auto-answer.js b/js/auto-answer.js
@@ -1,7 +1,7 @@
 define(function(require) {
 
 	var Adapt = require('coreJS/adapt');
-	var ItemsQuestionModel = require('core/js/models/itemsQuestionModel');
+	var ItemsQuestionModel = undefined;
 	var Hinting = require('./hinting');
 	var isQuestionSupported = require('./is-question-supported');
 
@@ -34,6 +34,22 @@ define(function(require) {
 			}
 		},
 
+		isItemsQuestionModel:function(model) {
+			if (ItemsQuestionModel) {
+				return model instanceof ItemsQuestionModel;
+			} else if (ItemsQuestionModel === null) {
+				return false;
+			}
+
+			if (require.defined('core/js/models/'+'itemsQuestionModel')) {
+				ItemsQuestionModel = require('core/js/models/'+'itemsQuestionModel');
+				return model instanceof ItemsQuestionModel;
+			} else {
+				ItemsQuestionModel = null;
+				return false;
+			}
+		},
+
 		answer:function(view, incorrectly) {
 			if (view.model.get('_isSubmitted')) return;
 
@@ -68,7 +84,7 @@ define(function(require) {
 		},
 
 		answerMultipleChoice:function(view, isGraphical) {
-			var items = view.model instanceof ItemsQuestionModel ? view.model.getChildren().toJSON() : view.model.get('_items');
+			var items = this.isItemsQuestionModel(view.model) ? view.model.getChildren().toJSON() : view.model.get('_items');
 			var noCorrectOptions = _.where(items, {'_shouldBeSelected':true}).length == 0;
 
 			if (noCorrectOptions) {
@@ -86,7 +102,7 @@ define(function(require) {
 
 		answerMultipleChoiceIncorrectly:function(view, isGraphical) {
 			var model = view.model;
-			var items = model instanceof ItemsQuestionModel ? model.getChildren().toJSON() : model.get('_items');
+			var items = this.isItemsQuestionModel(model) ? model.getChildren().toJSON() : model.get('_items');
 			var itemCount = items.length;
 			var selectionStates = _.times(itemCount, function() {return false;});
 			// number of items that should be selected