ela 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99139deeea3f3cbd46069dda8a3088a4c15e4f4dc2d68f5f2e3e82e0efe6b5e1
-  data.tar.gz: 1f6dbe66fa41d131825d3cec6347e0e747aa1bb28980782c4393d7ff52c0a734
+  metadata.gz: 2491e3281a37170e961d2fe8881f0407464e061e3c63d84bd7090ca33475504c
+  data.tar.gz: 8f84d6ac0026194fb8cc94dd3ab594e7de024261f2aae6d18707ed9d89266c16
 SHA512:
-  metadata.gz: 3a0ca70f814b28bb8a2cbeeea0ea4d1da68f155b572cbf56e16309026cdd2201d2a48abe708a6ce4a9c8a5789b598467856accd0767db390ab39cc9ce2f00354
-  data.tar.gz: 3ea52016577562dd88f264b0a88a8633d2286e8ef1f65eb081a294afb93350e8c03984af2118461ac1396fbb99e8ee25db171d03f57371cdd47185f317cc56eb
+  metadata.gz: dc9fd3c3f33ccae13d84a5f38d58d689784ab0afbe2515bec5de418737579fb8b7496dc22ed611900148931b11f16bd9a9fbcb597dc526124c6e2e2c7deb5fbd
+  data.tar.gz: dc51c25ddf72250db4ece895b48f9566d877983ac3fc2c5d7478e542030b360388c9ad09240cc05365a51156fc65afc95da55a5077a482ee8998e0f39eff5767

data/app/js/lib/views/graph.coffee

@@ -264,7 +264,7 @@ class ELA.Views.Graph extends ELA.Views.Canvas
     else
       @xOrigin/2
     xPos = Math.round(xPos) if @context.pixelRatio is 1
-    @context.translate(xPos, yPos + 8)
+    @context.translate(xPos, yPos + 15)
     MarkupText.render(@context, @xAxisLabel(), @defaultFont)
     @context.restore()
 
@@ -312,7 +312,7 @@ class ELA.Views.Graph extends ELA.Views.Canvas
     else
       @yOrigin/2
     yPos = Math.round(yPos) if @context.pixelRatio is 1
-    @context.translate(xPos - 8 - 12, yPos);
+    @context.translate(xPos - 15, yPos);
     @context.rotate(-Math.PI / 2);
     MarkupText.render(@context, @yAxisLabel(), @defaultFont)
     @context.restore()

data/app/js/lib/views/graph_view.coffee

@@ -59,6 +59,8 @@ class ELA.Views.GraphView extends ELA.Views.ViewportView
       app: @model
       xOrigin: options.graph?.xOrigin
       yOrigin: options.graph?.yOrigin
+      xScale: options.graph?.xScale
+      yScale: options.graph?.yScale
       xOriginRatio: options.graph?.xOriginRatio
       yOriginRatio: options.graph?.yOriginRatio
 

data/app/js/vendor/backbone.poised/form/base_control.coffee

@@ -40,8 +40,8 @@ class Backbone.Poised.BaseControl extends Backbone.Poised.View
     @lastErrors = errors
 
   render: =>
-    @renderVisibility()
     @$el.attr('class', "poised control #{@attribute}")
+    @renderVisibility()
     @$el.html @template
       label: @label or @loadLocale "formFields.#{@attribute}.label",
         defaultValue: @attribute.toLabel()

data/app/js/vendor/markup_text.coffee

@@ -18,12 +18,13 @@ class @MarkupText
       when 'alphabetic' then boundingBox.maxY
       when 'top' then boundingBox.y
       when 'hanging' then boundingBox.y
-      when 'middle' then Math.floor(boundingBox.h / 2)
+      when 'middle' then boundingBox.y + Math.floor(boundingBox.h / 2)
       when 'ideographic' then boundingBox.maxY
       when 'bottom' then boundingBox.maxY
       else 0
     context.scale(1 / context.pixelRatio, 1 / context.pixelRatio)
     context.drawImage(tempCanvas, -x, -y)
+    boundingBox
 
   constructor: (markup) ->
     @markup = markup

data/lib/ela/jasmine.rb

@@ -46,7 +46,6 @@ module ELA
         config.src_files = lambda { src_files }
         config.add_rack_path(ELA_JS_PREFIX, lambda { Rack::File.new(ELA_JS_PATH) })
         config.add_rack_path(ELA_SPEC_HELPERS_PREFIX, lambda { Rack::File.new(ELA_SPEC_HELPERS_PATH) })
-        config.show_console_log = true
       end
     end
     private_class_method :configure

data/lib/ela/version.rb

@@ -1,3 +1,3 @@
 module ELA
-  VERSION = '4.1.1'
+  VERSION = '4.1.2'
 end

data/package-lock.json

@@ -631,9 +631,9 @@
       "dev": true
     },
     "poised": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/poised/-/poised-0.3.0.tgz",
-      "integrity": "sha512-1gN+RcgX0Ri4k87glWs9LNblV9ZKYv0ABW9kSHJ7grtSlWcLrzGLbkg9ozCLv3UXg2caZNXUUZz+aYuxIeFcSA==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/poised/-/poised-0.3.1.tgz",
+      "integrity": "sha512-zHT6PlL7frmCqdTjTm1iFKyLXyKnjT0thks8wc8imiJKBtMn/s17Sg8J+3ZWof5X7tSc6aecSmV0ykFnNbQNmw==",
       "dev": true,
       "requires": {
         "nib": "1.0.3",

data/package.json

@@ -5,7 +5,7 @@
   "devDependencies": {
     "codo": "^2.1.2",
     "nib": "^1.1.2",
-    "poised": "^0.3.0",
+    "poised": "^0.3.1",
     "stylus": "^0.54.4"
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ela
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Franz Kißig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler