Support numeric sequence w/o predefined graph pane

[#53396591]
concord-consortium · Jul 15, 2013 · fdee532 · fdee532
1 parent ec13537
commit fdee532
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 11 deletions.
diff --git a/browser/js/converter.js b/browser/js/converter.js
@@ -796,7 +796,9 @@ require.define("/author/sequences.js", function (require, module, exports, __dir
           this.tablePane = pane;
         }
       }
-      if (this.dataSetName) this.graphPane.activeDatasetName = this.dataSetName;
+      if ((this.dataSetName != null) && (this.graphPane != null)) {
+        this.graphPane.activeDatasetName = this.dataSetName;
+      }
     }
 
     CorrectableSequenceWithFeedback.prototype.getRequiresGraphOrTable = function() {
@@ -1312,10 +1314,15 @@ require.define("/author/author-panes.js", function (require, module, exports, __
       });
     };
 
-    PredictionGraphPane.prototype.addToStep = function(step, _arg) {
+    PredictionGraphPane.prototype.addToStep = function(step, args) {
       var isActiveInputPane, previousAnnotation, uiBehavior;
-      isActiveInputPane = _arg.isActiveInputPane, previousAnnotation = _arg.previousAnnotation;
       PredictionGraphPane.__super__.addToStep.apply(this, arguments);
+      if (args != null) {
+        isActiveInputPane = args.isActiveInputPane, previousAnnotation = args.previousAnnotation;
+      } else {
+        isActiveInputPane = true;
+        previousAnnotation = false;
+      }
       if (isActiveInputPane) {
         uiBehavior = this.predictionType === "continuous_curves" ? "freehand" : "extend";
         step.addPredictionTool({
@@ -1329,7 +1336,7 @@ require.define("/author/author-panes.js", function (require, module, exports, __
           annotation: this.annotation
         });
       }
-      if (previousAnnotation) {
+      if (previousAnnotation != null) {
         return step.addAnnotationToPane({
           index: this.index,
           annotation: previousAnnotation

diff --git a/lib/author/author-panes.js b/lib/author/author-panes.js
diff --git a/lib/author/sequences.js b/lib/author/sequences.js
diff --git a/src/author/author-panes.coffee b/src/author/author-panes.coffee
@@ -117,13 +117,19 @@ AuthorPane.classFor['PredictionGraphPane'] = class PredictionGraphPane extends G
     super
     @annotation = runtimeActivity.createAndAppendAnnotation {type: 'FreehandSketch'}
 
-  addToStep: (step, {isActiveInputPane, previousAnnotation}) ->
+  addToStep: (step, args) ->
     super
+    if args?
+      { isActiveInputPane, previousAnnotation } = args
+    else
+      isActiveInputPane = true
+      previousAnnotation = false
+
     if isActiveInputPane
       uiBehavior = if @predictionType is "continuous_curves" then "freehand" else "extend"
       step.addPredictionTool { @index, @datadefRef,  @annotation, uiBehavior }
       step.addAnnotationToPane { @index, @annotation }
-    if previousAnnotation
+    if previousAnnotation?
       step.addAnnotationToPane { @index, annotation: previousAnnotation }
 
 

diff --git a/src/author/sequences.coffee b/src/author/sequences.coffee
@@ -173,7 +173,7 @@ class CorrectableSequenceWithFeedback
       @graphPane = pane if pane instanceof AuthorPane.classFor['PredefinedGraphPane']
       @tablePane = pane if pane instanceof AuthorPane.classFor['TablePane']
 
-    if @dataSetName then @graphPane.activeDatasetName = @dataSetName
+    if @dataSetName? and @graphPane? then @graphPane.activeDatasetName = @dataSetName
 
   getRequiresGraphOrTable: ->
     @getHasVisualPrompts() || @getNeedsGraphData()