ela 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1112b240f9642bc0878084ee7066762d730d7804
-  data.tar.gz: 59d78a09904bd572492cab10ffe75d40233530a9
+  metadata.gz: bb4619edb649e36852192e36da53215947d80d99
+  data.tar.gz: 3a616aa2061220cacf65b61e4abec4bd48ae0342
 SHA512:
-  metadata.gz: d545d29da4c083115779102fef81936a44b2c37925d01d15a624ba6b9d2d0c9c9b08d51cedf080eced714976c4fcd4ccda10799968c6a60980173a504d3d54b9
-  data.tar.gz: 3328796e67eee755034e8d35167d384497f200a54e813babd3b531c3613afdd9af0d7f8d0cb0c5eb7fe6e5de8c390e5fda3332accc1c618ac3695aed4ba0d181
+  metadata.gz: b01324e4bdf443a77ddc9bfbbc4dde41ab03ed4c6d5ba8d053de507800b1ecfe969c84451c6085d3cc955fc1c3e20e79ecca7f73e4ae58c7669f99dc7f56936b
+  data.tar.gz: 706e1209962ced109b068074ac30ff55c70ee4bc2c5c73e95da7eac180efcfe306f25aaa2494755b4b5cc4025aa8a6edc319757ae6b52daa9c69eb5fdb440e3d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ela (3.0.0)
+    ela (3.1.0)
       andand (~> 1.3, >= 1.3.3)
       bundler (~> 1.13)
       coffee-script (~> 2.4, >= 2.4.1)

data/app/css/screen.styl

@@ -113,10 +113,9 @@ li.share-form
       content "\f00d"
 
 article.viewport
-  display flex
+  display grid
 
   .view
-    flex 1
     display flex
     flex-direction column
     border-right 1px solid #bbb
@@ -218,6 +217,7 @@ article.viewport
     z-layer 'section', 'graph'
     flex 1
     overflow hidden
+    position relative
 
   div.graph-overlay-wrapper
     height 0

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

@@ -36,10 +36,10 @@ class ELA.Views.AxisHandler extends Backbone.Poised.View
     if @orientation is 'x'
       width = @displayParams.get('width')
       point = (range / width) *
-        (e.gesture.pointers[0].clientX - graphOffset.left - origin)
+        (e.gesture.center.x - graphOffset.left - origin)
     else # @orientation is 'y'
       height = @displayParams.get('height')
-      y = e.gesture.pointers[0].clientY - graphOffset.top
+      y = e.gesture.center.y - graphOffset.top
       y = Math.min(Math.max(y, 0), height)
       point = (range / height) * (origin - y)
 

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

@@ -188,6 +188,7 @@ class ELA.Views.BaseApp extends Backbone.Poised.View
         model: @model
         parentView: this
         views: @views
+        layout: @layout
         localePrefix: @localePrefix
       @$('.viewport').replaceWith(view.render().el)
 

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

@@ -11,6 +11,8 @@ class ELA.Views.ChartJS extends Backbone.Poised.View
       $.extend @chartConfig.options.title,
         fontFamily: 'Roboto'
         fontStyle: '500'
+    $.extend @chartConfig.options,
+      maintainAspectRatio: false
     @dataFunction = options.dataFunction
     @params = options.params
 

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

@@ -106,6 +106,10 @@ class ELA.Views.GraphView extends ELA.Views.ViewportView
           curves: @curves
           axisLabelingForCurve: @axisLabelingForCurve
         localePrefix: @localePrefix
+      if @leftAxisHandler?
+        view.$el.on('tap', @subviews.leftAxisHandler.updateValue)
+      if @bottomAxisHandler?
+        view.$el.on('tap', @subviews.bottomAxisHandler.updateValue)
       $graph.html(view.render().el)
 
     this

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

@@ -13,14 +13,29 @@ class ELA.Views.Viewport extends Backbone.Poised.View
 
     @subviews = {}
 
+    @layout = options.layout or
+      [ _.map(@views, (view, idx) -> String.fromCharCode(97 + idx)).join(' ') ]
+
+  _style: ->
+    'grid-template-areas: "' + @layout.join('" "') + '";' +
+      'grid-auto-columns: ' +
+      Array(@layout[0].split(' ').length).fill('1fr').join(' ') + ';' +
+      'grid-auto-rows: ' +
+      Array(@layout.length).fill('1fr').join(' ') + ';'
+
+
   render: ->
-    @$el.empty()
-    for view in @views
+    @$el.empty().attr('style', @_style())
+
+    for view, idx in @views
       options = _.extend
         model: @model
         parentView: this
         localePrefix: @localePrefix
+        attributes:
+          style: "grid-area: #{String.fromCharCode(97 + idx)}"
       , view.options
       view = @subviews[view.options.name] ?= new view.View(options)
       @$el.append(view.render().el)
+
     this

data/lib/ela/version.rb

@@ -1,3 +1,3 @@
 module ELA
-  VERSION = '3.0.0'
+  VERSION = '3.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ela
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Franz Kißig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler