ela 3.4.0 → 3.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +5 -5
- data/Gemfile.lock +4 -4
- data/app/js/lib/models/canvas_params.coffee +1 -1
- data/app/js/lib/models/graph_params.coffee +12 -5
- data/lib/ela/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
|
-
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
2
|
+
SHA1:
|
|
3
|
+
metadata.gz: 8c44e2a9031636b095db4859acd9aa4f12e1a1f3
|
|
4
|
+
data.tar.gz: 3c6ed9d4029b9ee480c6557f61bf04996d633f18
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8c84e3c59de22faa83b3a219112a1b5ccdcca201bdd2f961d8a3b56720f9a4c36b561c9ba729b1f338cfb7452a3d57f255cdda078f1b6f7702f7ae404e646f24
|
|
7
|
+
data.tar.gz: 0236a296b52186683ecf1138e3734f622ea29d98fbfb06580d9c1962785b59991fed30e86deda82df5d427ffb52eb7ca13a625d7a9359c25c3f13e64b3af5dce
|
data/Gemfile.lock
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
ela (3.2
|
|
4
|
+
ela (3.4.2)
|
|
5
5
|
andand (~> 1.3, >= 1.3.3)
|
|
6
6
|
bundler (~> 1.13)
|
|
7
7
|
coffee-script (~> 2.4, >= 2.4.1)
|
|
@@ -34,7 +34,7 @@ GEM
|
|
|
34
34
|
em-websocket (0.5.1)
|
|
35
35
|
eventmachine (>= 0.12.9)
|
|
36
36
|
http_parser.rb (~> 0.6.0)
|
|
37
|
-
eventmachine (1.2.
|
|
37
|
+
eventmachine (1.2.7)
|
|
38
38
|
execjs (2.7.0)
|
|
39
39
|
ffi (1.9.23)
|
|
40
40
|
formatador (0.2.5)
|
|
@@ -94,7 +94,7 @@ GEM
|
|
|
94
94
|
pry (0.11.3)
|
|
95
95
|
coderay (~> 1.1.0)
|
|
96
96
|
method_source (~> 0.9.0)
|
|
97
|
-
rack (1.6.
|
|
97
|
+
rack (1.6.10)
|
|
98
98
|
rack-protection (1.5.5)
|
|
99
99
|
rack
|
|
100
100
|
rack-test (1.0.0)
|
|
@@ -127,7 +127,7 @@ GEM
|
|
|
127
127
|
stylus-source (0.54.5)
|
|
128
128
|
thor (0.20.0)
|
|
129
129
|
tilt (1.4.1)
|
|
130
|
-
uglifier (4.1.
|
|
130
|
+
uglifier (4.1.10)
|
|
131
131
|
execjs (>= 0.3.0, < 3)
|
|
132
132
|
|
|
133
133
|
PLATFORMS
|
|
@@ -7,5 +7,5 @@ class ELA.Models.CanvasParams extends Backbone.Model
|
|
|
7
7
|
@app = attributes.app
|
|
8
8
|
delete attributes.app
|
|
9
9
|
# Special behavior: initial attributes overwrite defaults
|
|
10
|
-
@defaults = _.defaults(_.clone(@defaults)
|
|
10
|
+
@defaults = _.defaults(attributes, _.clone(@defaults))
|
|
11
11
|
super({}, options)
|
|
@@ -39,8 +39,8 @@ class ELA.Models.GraphParams extends ELA.Models.CanvasParams
|
|
|
39
39
|
@on('change:width change:height', @resize)
|
|
40
40
|
|
|
41
41
|
# @calculateRanges changes params.xyRange
|
|
42
|
-
@on('change:xScale', @
|
|
43
|
-
@on('change:yScale', @
|
|
42
|
+
@on('change:xScale', @calculateRanges)
|
|
43
|
+
@on('change:yScale', @calculateRanges)
|
|
44
44
|
|
|
45
45
|
@calculateRanges()
|
|
46
46
|
@bindCalculatorEvents()
|
|
@@ -91,6 +91,8 @@ class ELA.Models.GraphParams extends ELA.Models.CanvasParams
|
|
|
91
91
|
@set(yScale: @linkedYScale(xScale))
|
|
92
92
|
else
|
|
93
93
|
@set(xScale: @linkedXScale(yScale))
|
|
94
|
+
else
|
|
95
|
+
@set(xScale: @defaults.xScale, yScale: @defaults.yScale)
|
|
94
96
|
|
|
95
97
|
resize: ->
|
|
96
98
|
previous = @previousAttributes()
|
|
@@ -115,10 +117,15 @@ class ELA.Models.GraphParams extends ELA.Models.CanvasParams
|
|
|
115
117
|
else
|
|
116
118
|
@reset()
|
|
117
119
|
|
|
120
|
+
calculateRangeX: ->
|
|
121
|
+
@set(xRange: @maxRangeX())
|
|
122
|
+
|
|
123
|
+
calculateRangeY: ->
|
|
124
|
+
@set(yRange: @maxRangeY())
|
|
125
|
+
|
|
118
126
|
calculateRanges: ->
|
|
119
|
-
@
|
|
120
|
-
|
|
121
|
-
yRange: @maxRangeY()
|
|
127
|
+
@calculateRangeX()
|
|
128
|
+
@calculateRangeY()
|
|
122
129
|
|
|
123
130
|
maxRangeX: (func, xScale = @get('xScale')) ->
|
|
124
131
|
func = @get('axisLabelingForCurve')?.get('function') unless func?
|
data/lib/ela/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ela
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.4.
|
|
4
|
+
version: 3.4.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Franz Kißig
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-05-
|
|
11
|
+
date: 2018-05-25 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|
|
@@ -4180,7 +4180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
4180
4180
|
version: '0'
|
|
4181
4181
|
requirements: []
|
|
4182
4182
|
rubyforge_project:
|
|
4183
|
-
rubygems_version: 2.
|
|
4183
|
+
rubygems_version: 2.6.12
|
|
4184
4184
|
signing_key:
|
|
4185
4185
|
specification_version: 4
|
|
4186
4186
|
summary: HTML5 E-Learning Framework
|