ela 3.4.3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 689072c0c174cb2fc730ee5b2e50caa2d83c12e11fcbe89470d74f643f705ad3
-  data.tar.gz: 8d93ad13f253c579357466bc1002ce5c6f3ba35be90205f1e48d792a77491538
+  metadata.gz: 65471b954f418d935377faff787750449bc19f96946b2322283c393e30baf77e
+  data.tar.gz: bda2b54b6b704a9dcd633898a779243bea1c57a3e76869b027fac6196cba69f8
 SHA512:
-  metadata.gz: 9a66a26937dbfafa5b880ab4e677a6bd18b08f14d104e2f4a6ab8a9a72d15325a78b05b2e2abe72dfac4f61e6e09f98f5b3f48e31b124e7f03687a8547535b2a
-  data.tar.gz: 6c9e0bffab250d3a94764509af73039675879607908f2b16c9f8bc142af939fb97829c56d88a0e2481722c448f47e78bfd9d27ad6e4d23745f50178c8e5b5e73
+  metadata.gz: '085a800daff9349af2d8b4c86167ea5874d9e9dbba435531a22f45485f15c5e3cff94a16527823cdbc5355e17758ba3404f32f0ad478fba5af27d668e622e323'
+  data.tar.gz: '041857e395ad02c6e533f72f6f92ba0c0e79084e2d7c400615e6640d677f58b89ac61936429e289657cec75b7dce77edba98a92cf02e76f7d99fe861ec3d1caf'

data/app/css/screen.styl

@@ -121,13 +121,32 @@ article.viewport
     border-right 1px solid #bbb
     overflow hidden
 
-    &:last-child
-      border-right: none
+    a#upstream
+      display none
+
+      img
+        absolute none 0 0 none
+        height $axis-handler-size
+        z-layer 'section', 'graph'
+        opacity 0.4
+        transition opacity 100ms
+
+        &:hover
+          opacity 1
+
+      @media $media-lt-phone
+        pointer-events none
 
     .horizontal-wrapper
       display flex
       flex 1
 
+    &:last-child
+      border-right: none
+
+      a#upstream
+        display block
+
   div.legend
     z-layer 'section', 'legend'
     font-size .75em
@@ -219,6 +238,9 @@ article.viewport
     overflow hidden
     position relative
 
+    canvas
+      display block
+
   div.graph-overlay-wrapper
     height 0
     font-size .75em
@@ -230,18 +252,29 @@ article.viewport
 
   div.axis-handler
     text-align center
-    cursor pointer
     background $legend-background
-    padding 14px 5px
+
+    label
+      padding 14px 5px
+      display block
+      cursor pointer
+
+      &.has-input
+        padding 7.5px 5px
+        cursor inherit
+
+    .poised.textfield
+      display inline-block
+      width 140px
 
     &.axis-handler-left
       width $axis-handler-size
+      white-space nowrap
       position relative
 
-      span.hint
+      label
         absolute 50% none none 50%
         transform translateX(-50%) translateY(-50%) rotate(-90deg)
-        width 500px // ugly, but no alternative
 
 // vertical range slider and large, non-transparent legend with values
 #international-standard-atmosphere article.graph div.graph
@@ -358,14 +391,6 @@ aside.curves
       content "\f05a"
       margin-right 0.4em
 
-img.logo
-  absolute none 0 0 none
-  height $axis-handler-size
-  z-layer 'section', 'graph'
-
-  @media $media-lt-phone
-    display none
-
 span.mark
   background-color yellow
 

data/app/js/lib/views/1_viewport_view.coffee

@@ -1,4 +1,9 @@
 ELA.Views ?= {}
 
 class ELA.Views.ViewportView extends Backbone.Poised.View
-  className: 'view active'
+  className: 'view'
+
+  render: =>
+    @$el.empty()
+
+    this

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

@@ -3,17 +3,22 @@ class ELA.Views.AxisHandler extends Backbone.Poised.View
   className: 'axis-handler'
 
   events:
-    'pan': 'updateValue'
-    'tap': 'updateValue'
+    'pan': 'handlePan'
+    'tap': 'handleTap'
+    'press': 'showInputField'
+    'doubletap': 'showInputField'
+    'pressup': 'focusInputField'
+    'tap input': 'handleInputTap'
 
   hammerjs:
     recognizers: [
       [Hammer.Rotate, { enable: false }],
       [Hammer.Pinch, { enable: false }, ['rotate']],
       [Hammer.Swipe, { enable: false }],
-      [Hammer.Pan, { direction: Hammer.DIRECTION_ALL, threshold: 1 }, ['swipe']],
+      [Hammer.Pan, { direction: Hammer.DIRECTION_ALL, threshold: 10 }, ['swipe']],
       [Hammer.Tap, { threshold: 5 }],
-      [Hammer.Press, { enable: false }]
+      [Hammer.Tap, { event: 'doubletap', taps: 2, posThreshold: 20, threshold: 5 }, ['tap']],
+      [Hammer.Press]
     ]
 
   initialize: (options) ->
@@ -35,7 +40,24 @@ class ELA.Views.AxisHandler extends Backbone.Poised.View
     @minValue ?= options.minValue
     @minValue ?= options.range?[1]
 
-    @listenTo @model, "change:#{@attribute}", @renderText
+    @listenTo(@model, "change:#{@attribute}", @renderSpan)
+
+    @subviews = {}
+    @formSettings = @model.loadSettings("formFields")[@attribute]
+    @params = new Backbone.Model
+      showInput: false
+    @listenTo(@params, 'change:showInput', @renderSpan)
+
+    @lastFocusOutAt = undefined
+
+  handleTap: (e) =>
+    @updateValue(e) unless @hasRecentlyOpenInput()
+
+  handlePan: (e) =>
+    @updateValue(e) unless @params.get('showInput')
+
+  handleInputTap: (e) =>
+    e.stopPropagation()
 
   updateValue: (e) =>
     origin = @displayParams.get("#{@orientation}Origin")
@@ -57,16 +79,57 @@ class ELA.Views.AxisHandler extends Backbone.Poised.View
     point = Math.min(point, @maxValue) if isFinite(@maxValue)
     @model.set(@attribute, point)
 
-  renderText: =>
-    @$el.find('span').text(t(
+  showInputField: ->
+    @params.set(showInput: true)
+
+  focusInputField: =>
+    _.defer => @subviews.inputControl?.$('input').focus()
+
+  closeInputField: =>
+    @params.set(showInput: false)
+
+  hasRecentlyOpenInput: ->
+    # not (new Date - @lastFocusOutAt < 100) and (new Date - @lastFocusOutAt > 100)
+    # are not equal when @lastFocusOutAt is undefined!
+    @params.get('showInput') or (new Date - @lastFocusOutAt < 100)
+
+  handleFocusOut: =>
+    @lastFocusOutAt = new Date
+    @closeInputField()
+
+  text: (value) =>
+    t(
       "#{@model.name}.axisHandler.#{@attribute}.label"
       "#{@model.name}.axisHandler.label"
       'axisHandler.label'
-      value: @model.get(@attribute).toFixed(@precision)
-    ))
+      value: "<span></span>"
+    )
+
+  renderSpan: =>
+    if @params.get('showInput')
+      @$label.addClass('has-input')
+      control = new Backbone.Poised.Textfield(
+        _.defaults(
+          model: @model
+          attribute: @attribute
+          type: 'number'
+        ,
+          @formSettings
+        )
+      )
+      @subviews.inputControl = control
+      @listenToOnce(control, 'changeValue', @handleFocusOut)
+      @$label.find('span').html(control.render().el)
+    else
+      @$label.removeClass('has-input')
+      @$label.find('span').text(
+        @model.get(@attribute).toFixed(@precision) + ' ' + @formSettings.unit
+      )
 
   render: =>
-    @$el.html('<span class="hint"></span>')
+    delete @subviews.inputField
+    @$label = $('<label>').html(@text())
+    @renderSpan()
+    @$el.html(@$label)
     @$el.addClass("axis-handler-#{@position}")
-    @renderText()
     this

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

@@ -29,7 +29,8 @@ class ELA.Views.BaseApp extends Backbone.Poised.View
     'tap header .poised.subviews.select .option.subapp': 'openSubapp'
     'tap header .poised.subviews.select .option.layout': 'openLayout'
     'tap header .context.icon': 'toggleContextMenu'
-    'tap article.graph:has(~ aside.active)': 'hideAsides'
+    'tap article.viewport:has(~ aside.active)': 'hideAsides'
+    'tap article.viewport:has(~ .headup.active)': 'hideHeadup'
     'tap section:has(.subviews.select.view)': 'hideSubappOptions'
     'tap section:has(.menu.view)': 'hideMenus'
 
@@ -41,8 +42,8 @@ class ELA.Views.BaseApp extends Backbone.Poised.View
   initialize: ->
     @listenTo @model, 'change:currentAside', @toggleAside
     @listenTo @model, 'change:showHelp', @renderHelp
-    @on 'controlLiveChangeStart', @liveChangeStart
-    @on 'controlLiveChangeEnd', @liveChangeEnd
+    @on 'controlLiveChangeStart', @showHeadup
+    @on 'controlLiveChangeEnd', @hideHeadup
 
     for aside in @asides
       aside.link ?= 'icon'
@@ -150,15 +151,20 @@ class ELA.Views.BaseApp extends Backbone.Poised.View
       @$("header .#{value}.aside.icon").toggleClass('active', true)
       @$("aside.#{value}").toggleClass('active', true)
 
-  liveChangeStart: (slider) =>
-    if $(window).width() <= 768
-      @$('aside.active').addClass('hidden')
-      @subviews.headup.activate(slider)
+  showHeadup: (control, options = {}) =>
+    options.mobileOnly ?= true
+    isMobile = $(window).width() <= 768
+    if isMobile or not options.mobileOnly
+      if isMobile
+        @$('aside.active').addClass('hidden')
+      else
+        @model.set('currentAside', null)
 
-  liveChangeEnd: =>
-    if $(window).width() <= 768
-      @$('aside.active').removeClass('hidden')
-      @subviews.headup.deactivate()
+      @subviews.headup.activate(control)
+
+  hideHeadup: =>
+    @$('aside.active').removeClass('hidden')
+    @subviews.headup.deactivate()
 
   setActive: (active) =>
     @$el.toggleClass('active', active)

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

@@ -11,6 +11,7 @@ class ELA.Views.Canvas extends Backbone.Poised.View
     super
     fontWeight = if window.devicePixelRatio > 1 then 300 else 400
     @defaultFont = "#{fontWeight} 12px Roboto"
+    @largeBoldFont = "#{fontWeight * 2} 20px Roboto"
 
   initialize: (options = {}) ->
     # Make sure we got the parameters model for holding view specific

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

@@ -1,6 +1,8 @@
 ELA.Views ?= {}
 
 class ELA.Views.ChartView extends ELA.Views.ViewportView
+  className: 'view chart-view'
+
   initialize: (options = {}) ->
     unless options.name?
       throw 'ELA.Views.GraphView: option `name` is required'

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

@@ -1,6 +1,8 @@
 ELA.Views ?= {}
 
 class ELA.Views.GraphView extends ELA.Views.ViewportView
+  className: "#{ELA.Views.ViewportView::className} graph-view"
+
   initialize: (options = {}) ->
     unless options.name?
       throw 'ELA.Views.GraphView: option `name` is required'
@@ -55,11 +57,15 @@ class ELA.Views.GraphView extends ELA.Views.ViewportView
       xAxis: @xAxis
       yAxis: @yAxis
       app: @model
+      xOrigin: options.graph?.xOrigin
+      yOrigin: options.graph?.yOrigin
+      xOriginRatio: options.graph?.xOriginRatio
+      yOriginRatio: options.graph?.yOriginRatio
 
     @subviews = {}
 
   render: =>
-    @$el.empty()
+    super
 
     if @LegendView?
       view = @subviews.legend ?= new @LegendView
@@ -90,7 +96,10 @@ class ELA.Views.GraphView extends ELA.Views.ViewportView
         localePrefix: @localePrefix
       $horizontalWrapper.append(view.render().el)
 
-    $horizontalWrapper.append($('<div>', class: 'graph'))
+    $graph = $('<div>', class: 'graph')
+    $a = $('<a>', id: 'upstream', href: ELA.settings.upstream.url, target: '_blank')
+    $a.html($('<img>', src: 'images/logo.png'))
+    $horizontalWrapper.append($graph.html($a))
     @$el.append($horizontalWrapper)
 
     if @bottomAxisHandler?
@@ -104,7 +113,6 @@ class ELA.Views.GraphView extends ELA.Views.ViewportView
       @$el.append(view.render().el)
 
     delay =>
-      $graph = @$('.graph')
       @subviews.graph?.remove()
       # Taken from ELA.Views.Canvas::readCanvasResolution
       @displayParams.set
@@ -116,9 +124,13 @@ class ELA.Views.GraphView extends ELA.Views.ViewportView
         params: @displayParams
         localePrefix: @localePrefix
       if @leftAxisHandler?
-        view.$el.on('tap', @subviews.leftAxisHandler.updateValue)
+        view.$el.on 'tap', (e) =>
+          unless @subviews.bottomAxisHandler?.hasRecentlyOpenInput()
+            @subviews.leftAxisHandler.handleTap(e)
       if @bottomAxisHandler?
-        view.$el.on('tap', @subviews.bottomAxisHandler.updateValue)
-      $graph.html(view.render().el)
+        view.$el.on 'tap', (e) =>
+          unless @subviews.leftAxisHandler?.hasRecentlyOpenInput()
+            @subviews.bottomAxisHandler.handleTap(e)
+      $graph.append(view.render().el)
 
     this

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

@@ -8,7 +8,7 @@ class ELA.Views.Headup extends Backbone.Poised.View
 
   deactivate: =>
     @$el.removeClass('active')
-    @subviews.control.remove()
+    @subviews.control?.remove()
 
   render: =>
     @$el.html(@subviews.control.render().el)

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

@@ -4,6 +4,7 @@ class Backbone.Poised.Textfield extends Backbone.View
   events:
     'focusin input': 'clearInputValue'
     'focusout input': 'readInput'
+    'keyup input': 'handleKeyUp'
 
   initialize: (options = {}) =>
     throw new Error('Missing `model` option') unless options.model?
@@ -44,7 +45,7 @@ class Backbone.Poised.Textfield extends Backbone.View
         else
           value = @model.get(@attribute)
 
-      if @options.precision
+      if @options.precision?
         valueString = value.toFixed(@options.precision)
 
     @$input.val(valueString or value)
@@ -59,8 +60,12 @@ class Backbone.Poised.Textfield extends Backbone.View
     return if @$input.is(':focus')
     @_updateValue(undefined, updateModel: false)
 
+  handleKeyUp: (e) =>
+    @readInput() if e.keyCode == 13
+
   readInput: =>
     @_updateValue(@$input.val())
+    @trigger('changeValue')
 
   clearInputValue: =>
     @$input.val('') if @options.clearOnFocus

data/app/views/general/app.jst.hamlc

@@ -19,6 +19,4 @@
           - if @hasHelpText
             %li.help= t('contextMenu.help')
   .viewport
-  %a{ href: ELA.settings.upstream.url, target: '_blank' }
-    %img.logo{ src: 'images/logo.png' }
   %aside.right.headup

data/lib/ela/version.rb

@@ -1,3 +1,3 @@
 module ELA
-  VERSION = '3.4.3'
+  VERSION = '4.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ela
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 4.0.0
 platform: ruby
 authors:
 - Franz Kißig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler