app/js/lib/views/graph_view.coffee in ela-4.1.2 vs app/js/lib/views/graph_view.coffee in ela-4.1.3

@@ -16,16 +16,18 @@
       @legendValueAttribute ?= options.graph?.axes?.x?.attribute
 
     if options.graphOverlay?.view?
       @GraphOverlayView = options.graphOverlay.view.toFunction()
 
-    if options.graph?.axes?.x?.y?
-      @xAxis = _.pick(options.graph.axes.x, 'y')
+    if options.graph?.axes?
+      if options.graph.axes.x?
+        @xAxisY = options.graph.axes.x.y
+        @xAxisScale = options.graph.axes.x.scale
+      if options.graph.axes.y?
+        @yAxisX = options.graph.axes.y.x
+        @yAxisScale = options.graph.axes.y.scale
 
-    if options.graph?.axes?.y?.x?
-      @yAxis = _.pick(options.graph.axes.y, 'x')
-
     for axis, props of options.graph?.axes
       if props.handler
         switch axis
           when 'x' then @bottomAxisHandler = attribute: props.attribute
           when 'y' then @leftAxisHandler = attribute: props.attribute
@@ -52,11 +54,13 @@
       @GraphView = ELA.Views.Graph
     @displayParams = @model.displayParams[options.name] ?= new @GraphView.Params
       guides: @guides
       curves: @curves
       axisLabelingForCurve: @axisLabelingForCurve
-      xAxis: @xAxis
-      yAxis: @yAxis
+      xAxisY: @xAxisY
+      xAxisScale: @xAxisScale
+      yAxisX: @yAxisX
+      yAxisScale: @yAxisScale
       app: @model
       xOrigin: options.graph?.xOrigin
       yOrigin: options.graph?.yOrigin
       xScale: options.graph?.xScale
       yScale: options.graph?.yScale