ela 4.1.1 → 4.1.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.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/app/js/lib/views/graph.coffee +2 -2
  3. data/app/js/lib/views/graph_view.coffee +2 -0
  4. data/app/js/vendor/backbone.poised/form/base_control.coffee +1 -1
  5. data/app/js/vendor/markup_text.coffee +2 -1
  6. data/lib/ela/jasmine.rb +0 -1
  7. data/lib/ela/version.rb +1 -1
  8. data/package-lock.json +3 -3
  9. data/package.json +1 -1
  10. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 99139deeea3f3cbd46069dda8a3088a4c15e4f4dc2d68f5f2e3e82e0efe6b5e1
4
- data.tar.gz: 1f6dbe66fa41d131825d3cec6347e0e747aa1bb28980782c4393d7ff52c0a734
3
+ metadata.gz: 2491e3281a37170e961d2fe8881f0407464e061e3c63d84bd7090ca33475504c
4
+ data.tar.gz: 8f84d6ac0026194fb8cc94dd3ab594e7de024261f2aae6d18707ed9d89266c16
5
5
  SHA512:
6
- metadata.gz: 3a0ca70f814b28bb8a2cbeeea0ea4d1da68f155b572cbf56e16309026cdd2201d2a48abe708a6ce4a9c8a5789b598467856accd0767db390ab39cc9ce2f00354
7
- data.tar.gz: 3ea52016577562dd88f264b0a88a8633d2286e8ef1f65eb081a294afb93350e8c03984af2118461ac1396fbb99e8ee25db171d03f57371cdd47185f317cc56eb
6
+ metadata.gz: dc9fd3c3f33ccae13d84a5f38d58d689784ab0afbe2515bec5de418737579fb8b7496dc22ed611900148931b11f16bd9a9fbcb597dc526124c6e2e2c7deb5fbd
7
+ data.tar.gz: dc51c25ddf72250db4ece895b48f9566d877983ac3fc2c5d7478e542030b360388c9ad09240cc05365a51156fc65afc95da55a5077a482ee8998e0f39eff5767
data/app/js/lib/views/graph.coffee CHANGED
@@ -264,7 +264,7 @@ class ELA.Views.Graph extends ELA.Views.Canvas
264
264
  else
265
265
  @xOrigin/2
266
266
  xPos = Math.round(xPos) if @context.pixelRatio is 1
267
- @context.translate(xPos, yPos + 8)
267
+ @context.translate(xPos, yPos + 15)
268
268
  MarkupText.render(@context, @xAxisLabel(), @defaultFont)
269
269
  @context.restore()
270
270
 
@@ -312,7 +312,7 @@ class ELA.Views.Graph extends ELA.Views.Canvas
312
312
  else
313
313
  @yOrigin/2
314
314
  yPos = Math.round(yPos) if @context.pixelRatio is 1
315
- @context.translate(xPos - 8 - 12, yPos);
315
+ @context.translate(xPos - 15, yPos);
316
316
  @context.rotate(-Math.PI / 2);
317
317
  MarkupText.render(@context, @yAxisLabel(), @defaultFont)
318
318
  @context.restore()
data/app/js/lib/views/graph_view.coffee CHANGED
@@ -59,6 +59,8 @@ class ELA.Views.GraphView extends ELA.Views.ViewportView
59
59
  app: @model
60
60
  xOrigin: options.graph?.xOrigin
61
61
  yOrigin: options.graph?.yOrigin
62
+ xScale: options.graph?.xScale
63
+ yScale: options.graph?.yScale
62
64
  xOriginRatio: options.graph?.xOriginRatio
63
65
  yOriginRatio: options.graph?.yOriginRatio
64
66
 
data/app/js/vendor/backbone.poised/form/base_control.coffee CHANGED
@@ -40,8 +40,8 @@ class Backbone.Poised.BaseControl extends Backbone.Poised.View
40
40
  @lastErrors = errors
41
41
 
42
42
  render: =>
43
- @renderVisibility()
44
43
  @$el.attr('class', "poised control #{@attribute}")
44
+ @renderVisibility()
45
45
  @$el.html @template
46
46
  label: @label or @loadLocale "formFields.#{@attribute}.label",
47
47
  defaultValue: @attribute.toLabel()
data/app/js/vendor/markup_text.coffee CHANGED
@@ -18,12 +18,13 @@ class @MarkupText
18
18
  when 'alphabetic' then boundingBox.maxY
19
19
  when 'top' then boundingBox.y
20
20
  when 'hanging' then boundingBox.y
21
- when 'middle' then Math.floor(boundingBox.h / 2)
21
+ when 'middle' then boundingBox.y + Math.floor(boundingBox.h / 2)
22
22
  when 'ideographic' then boundingBox.maxY
23
23
  when 'bottom' then boundingBox.maxY
24
24
  else 0
25
25
  context.scale(1 / context.pixelRatio, 1 / context.pixelRatio)
26
26
  context.drawImage(tempCanvas, -x, -y)
27
+ boundingBox
27
28
 
28
29
  constructor: (markup) ->
29
30
  @markup = markup
data/lib/ela/jasmine.rb CHANGED
@@ -46,7 +46,6 @@ module ELA
46
46
  config.src_files = lambda { src_files }
47
47
  config.add_rack_path(ELA_JS_PREFIX, lambda { Rack::File.new(ELA_JS_PATH) })
48
48
  config.add_rack_path(ELA_SPEC_HELPERS_PREFIX, lambda { Rack::File.new(ELA_SPEC_HELPERS_PATH) })
49
- config.show_console_log = true
50
49
  end
51
50
  end
52
51
  private_class_method :configure
data/lib/ela/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ELA
2
- VERSION = '4.1.1'
2
+ VERSION = '4.1.2'
3
3
  end
data/package-lock.json CHANGED
@@ -631,9 +631,9 @@
631
631
  "dev": true
632
632
  },
633
633
  "poised": {
634
- "version": "0.3.0",
635
- "resolved": "https://registry.npmjs.org/poised/-/poised-0.3.0.tgz",
636
- "integrity": "sha512-1gN+RcgX0Ri4k87glWs9LNblV9ZKYv0ABW9kSHJ7grtSlWcLrzGLbkg9ozCLv3UXg2caZNXUUZz+aYuxIeFcSA==",
634
+ "version": "0.3.1",
635
+ "resolved": "https://registry.npmjs.org/poised/-/poised-0.3.1.tgz",
636
+ "integrity": "sha512-zHT6PlL7frmCqdTjTm1iFKyLXyKnjT0thks8wc8imiJKBtMn/s17Sg8J+3ZWof5X7tSc6aecSmV0ykFnNbQNmw==",
637
637
  "dev": true,
638
638
  "requires": {
639
639
  "nib": "1.0.3",
data/package.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "devDependencies": {
6
6
  "codo": "^2.1.2",
7
7
  "nib": "^1.1.2",
8
- "poised": "^0.3.0",
8
+ "poised": "^0.3.1",
9
9
  "stylus": "^0.54.4"
10
10
  }
11
11
  }
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: 4.1.1
4
+ version: 4.1.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-10-11 00:00:00.000000000 Z
11
+ date: 2018-10-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler