ela 3.4.0 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: c91b44405143938c612defcb74ac065e9361b55f9c46c2ebb9f53a4ea7600258
-  data.tar.gz: e82d008fcebaee67f00177cdca822c0300da4720ecb0379e55917e232917281e
+SHA1:
+  metadata.gz: 8c44e2a9031636b095db4859acd9aa4f12e1a1f3
+  data.tar.gz: 3c6ed9d4029b9ee480c6557f61bf04996d633f18
 SHA512:
-  metadata.gz: b59a746ea97d2f022bd0e4f86ca5dfa27c9fd2815286802c6880ac2a192ca1121ef5a2afff6a3f5e782c866a70f07c2dbfd64f96ff339b5311caf484dabf9be6
-  data.tar.gz: 654f5edb7d7a06d21ba1a7449d3db4a0a80d28b061f9ff14404fdedde3c01762e31876b789c8b6f82ff45bf6cb10548b0d5e234082f58ebe97dbbdc0d32da2db
+  metadata.gz: 8c84e3c59de22faa83b3a219112a1b5ccdcca201bdd2f961d8a3b56720f9a4c36b561c9ba729b1f338cfb7452a3d57f255cdda078f1b6f7702f7ae404e646f24
+  data.tar.gz: 0236a296b52186683ecf1138e3734f622ea29d98fbfb06580d9c1962785b59991fed30e86deda82df5d427ffb52eb7ca13a625d7a9359c25c3f13e64b3af5dce

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ela (3.2.0)
+    ela (3.4.2)
       andand (~> 1.3, >= 1.3.3)
       bundler (~> 1.13)
       coffee-script (~> 2.4, >= 2.4.1)
@@ -34,7 +34,7 @@ GEM
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.5)
+    eventmachine (1.2.7)
     execjs (2.7.0)
     ffi (1.9.23)
     formatador (0.2.5)
@@ -94,7 +94,7 @@ GEM
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rack (1.6.9)
+    rack (1.6.10)
     rack-protection (1.5.5)
       rack
     rack-test (1.0.0)
@@ -127,7 +127,7 @@ GEM
     stylus-source (0.54.5)
     thor (0.20.0)
     tilt (1.4.1)
-    uglifier (4.1.9)
+    uglifier (4.1.10)
       execjs (>= 0.3.0, < 3)
 
 PLATFORMS

data/app/js/lib/models/canvas_params.coffee

@@ -7,5 +7,5 @@ class ELA.Models.CanvasParams extends Backbone.Model
     @app = attributes.app
     delete attributes.app
     # Special behavior: initial attributes overwrite defaults
-    @defaults = _.defaults(_.clone(@defaults), attributes)
+    @defaults = _.defaults(attributes, _.clone(@defaults))
     super({}, options)

data/app/js/lib/models/graph_params.coffee

@@ -39,8 +39,8 @@ class ELA.Models.GraphParams extends ELA.Models.CanvasParams
     @on('change:width change:height', @resize)
 
     # @calculateRanges changes params.xyRange
-    @on('change:xScale', @calculateRangeX)
-    @on('change:yScale', @calculateRangeY)
+    @on('change:xScale', @calculateRanges)
+    @on('change:yScale', @calculateRanges)
 
     @calculateRanges()
     @bindCalculatorEvents()
@@ -91,6 +91,8 @@ class ELA.Models.GraphParams extends ELA.Models.CanvasParams
         @set(yScale: @linkedYScale(xScale))
       else
         @set(xScale: @linkedXScale(yScale))
+    else
+      @set(xScale: @defaults.xScale, yScale: @defaults.yScale)
 
   resize: ->
     previous = @previousAttributes()
@@ -115,10 +117,15 @@ class ELA.Models.GraphParams extends ELA.Models.CanvasParams
     else
       @reset()
 
+  calculateRangeX: ->
+    @set(xRange: @maxRangeX())
+
+  calculateRangeY: ->
+    @set(yRange: @maxRangeY())
+
   calculateRanges: ->
-    @set
-      xRange: @maxRangeX()
-      yRange: @maxRangeY()
+    @calculateRangeX()
+    @calculateRangeY()
 
   maxRangeX: (func, xScale = @get('xScale')) ->
     func = @get('axisLabelingForCurve')?.get('function') unless func?

data/lib/ela/version.rb

@@ -1,3 +1,3 @@
 module ELA
-  VERSION = '3.4.0'
+  VERSION = '3.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ela
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.2
 platform: ruby
 authors:
 - Franz Kißig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -4180,7 +4180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: HTML5 E-Learning Framework