Changeset - cc4ca2935921
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
drewp@bigasterisk.com - 8 years ago 2017-06-09 04:50:11
drewp@bigasterisk.com
closer to edits operating across selected notes
Ignore-this: da21542b378158f586a49e48c0aa9d1c
2 files changed with 16 insertions and 7 deletions:
light9/web/timeline/timeline-elements.html
4
1
light9/web/timeline/timeline.coffee
12
6
0 comments (0 inline, 0 general)
light9/web/timeline/timeline-elements.html
➞
Show inline comments
 
@@ -58,6 +58,7 @@
 
                           song="{{song}}"></light9-timeline-audio>
 
    <light9-timeline-time-zoomed id="zoomed"
 
                                 graph="{{graph}}"
 
                                 selection="{{selection}}"
 
                                 dia="{{dia}}"
 
                                 set-adjuster="{{setAdjuster}}"
 
                                 song="{{song}}"
 
@@ -65,7 +66,7 @@
 
                                 zoom="{{viewState.zoomSpec}}"
 
                                 zoom-in-x="{{zoomInX}}">
 
    </light9-timeline-time-zoomed>
 
    <light9-timeline-diagram-layer id="dia"></light9-timeline-diagram-layer>
 
    <light9-timeline-diagram-layer id="dia" selection="{{selection}}"></light9-timeline-diagram-layer>
 
    <light9-adjusters-canvas id="adjustersCanvas" set-adjuster="{{setAdjuster}}">
 
    </light9-adjusters-canvas>
 
    <light9-cursor-canvas id="cursorCanvas"></light9-cursor-canvas>
 
@@ -108,6 +109,7 @@
 
      <div id="rows">
 
        <template is="dom-repeat" items="{{rows}}">
 
          <light9-timeline-graph-row graph="{{graph}}"
 
                                     selection="{{selection}}"
 
                                     dia="{{dia}}"
 
                                     set-adjuster="{{setAdjuster}}"
 
                                     song="{{song}}"
 
@@ -238,6 +240,7 @@
 
    </style>
 
    <light9-timeline-note-inline-attrs rect="{{inlineRect}}"
 
                                       graph="{{graph}}"
 
                                       selection="{{selection}}"
 
                                       song="{{song}}"
 
                                       uri="{{uri}}"
 
    >
light9/web/timeline/timeline.coffee
➞
Show inline comments
 
@@ -39,6 +39,7 @@ Polymer
 
    songPlaying: {type: Boolean, notify: true}
 
    fullZoomX: {type: Object, notify: true}
 
    zoomInX: {type: Object, notify: true}
 
    selection: {type: Object, notify: true}
 
  width: ko.observable(1)
 
  listeners:
 
    'iron-resize': '_onIronResize'
 
@@ -57,6 +58,7 @@ Polymer
 

			




	
	
	
		
 
  ready: ->

			




	
	
	
		
 
    ko.options.deferUpdates = true;

			




	
	
	
		
 
    @selection = {hover: ko.observable(null), selected: ko.observable([])}

			




	
	
	
		
 

			




	
	
	
		
 
    window.debug_zoomOrLayoutChangedCount = 0

			




	
	
	
		
 
    window.debug_adjUpdateDisplay = 0

			




	
	
		
 
@@ -84,6 +86,7 @@ Polymer

			




	
	
	
		
 
    elemCount = (tag) -> document.getElementsByTagName(tag).length

			




	
	
	
		
 
    @debug = "#{window.debug_zoomOrLayoutChangedCount} layout change,

			




	
	
	
		
 
     #{elemCount('light9-timeline-note')} notes,

			




	
	
	
		
 
     #{@selection.selected().length} selected

			




	
	
	
		
 
     #{elemCount('light9-timeline-graph-row')} rows,

			




	
	
	
		
 
     #{window.debug_adjsCount} adjuster items registered,

			




	
	
	
		
 
     #{window.debug_adjUpdateDisplay} adjuster updateDisplay calls,

			




	
	
		
 
@@ -262,6 +265,7 @@ Polymer

			




	
	
	
		
 
  behaviors: [ Polymer.IronResizableBehavior ]

			




	
	
	
		
 
  properties:

			




	
	
	
		
 
    graph: { type: Object, notify: true }

			




	
	
	
		
 
    selection: { type: Object, notify: true }

			




	
	
	
		
 
    dia: { type: Object, notify: true }

			




	
	
	
		
 
    song: { type: String, notify: true }

			




	
	
	
		
 
    zoomInX: { type: Object, notify: true }

			




	
	
		
 
@@ -374,6 +378,7 @@ Polymer

			




	
	
	
		
 
    zoomInX: { type: Object, notify: true }

			




	
	
	
		
 
    noteUris: { type: Array, notify: true }

			




	
	
	
		
 
    rowIndex: { type: Object, notify: true }

			




	
	
	
		
 
    selection: { type: Object, notify: true }

			




	
	
	
		
 
  observers: [

			




	
	
	
		
 
    'onGraph(graph, dia, setAdjuster, song, zoomInX)'

			




	
	
	
		
 
    'update(song, rowIndex)'

			




	
	
		
 
@@ -394,6 +399,7 @@ Polymer

			




	
	
	
		
 
    updateChildren @, notesForThisRow, (newUri) =>

			




	
	
	
		
 
      child = document.createElement('light9-timeline-note')

			




	
	
	
		
 
      child.graph = @graph

			




	
	
	
		
 
      child.selection = @selection

			




	
	
	
		
 
      child.dia = @dia

			




	
	
	
		
 
      child.uri = newUri

			




	
	
	
		
 
      child.setAdjuster = @setAdjuster

			




	
	
		
 
@@ -423,6 +429,7 @@ Polymer

			




	
	
	
		
 
  listeners: 'iron-resize': 'update'

			




	
	
	
		
 
  properties:

			




	
	
	
		
 
    graph: { type: Object, notify: true }

			




	
	
	
		
 
    selection: { type: Object, notify: true }

			




	
	
	
		
 
    dia: { type: Object, notify: true }

			




	
	
	
		
 
    uri: { type: String, notify: true }

			




	
	
	
		
 
    zoomInX: { type: Object, notify: true }

			




	
	
		
 
@@ -579,6 +586,7 @@ Polymer

			




	
	
	
		
 
    effectLabel: { type: String, notify: true }

			




	
	
	
		
 
    colorScale: { type: String, notify: true }

			




	
	
	
		
 
    noteLabel: { type: String, notify: true }

			




	
	
	
		
 
    selection: { type: Object, notify: true }

			




	
	
	
		
 
  observers: [

			




	
	
	
		
 
    'addHandler(graph, uri)'

			




	
	
	
		
 
    'onColorScale(graph, uri, colorScale)'

			




	
	
		
 
@@ -591,7 +599,7 @@ Polymer

			




	
	
	
		
 
      return

			




	
	
	
		
 
      

			




	
	
	
		
 
    quad = (s, p, o) => {subject: s, predicate: p, object: o, graph: @song}

			




	
	
	
		
 

			




	
	
	
		
 
    log('ch', ko.toJS(@selection))

			




	
	
	
		
 
    settingValue = @graph.Literal(@colorScale)

			




	
	
	
		
 
    if @existingColorScaleSetting

			




	
	
	
		
 
      @graph.patchObject(@existingColorScaleSetting, U(':value'), settingValue, @song)

			




	
	
		
 
@@ -891,10 +899,11 @@ Polymer

			




	
	
	
		
 
Polymer

			




	
	
	
		
 
  # note boxes. Page selection.

			




	
	
	
		
 
  is: 'light9-timeline-diagram-layer'

			




	
	
	
		
 
  properties: {}

			




	
	
	
		
 
  properties: {

			




	
	
	
		
 
    selection: {type: Object, notify: true}

			




	
	
	
		
 
  }

			




	
	
	
		
 
  ready: ->

			




	
	
	
		
 
    @elemById = {}

			




	
	
	
		
 
    @selection = {hover: ko.observable(null), selected: ko.observable([])}

			




	
	
	
		
 

			




	
	
	
		
 
  attached: ->

			




	
	
	
		
 
    @querySelector('svg').add

			




	
	
		
 
@@ -954,9 +963,7 @@ Polymer

			




	
	
	
		
 
    elem = @getOrCreateElem areaId, 'notes', 'path', attrs, (elem) =>

			




	
	
	
		
 
      elem.addEventListener 'mouseenter', =>

			




	
	
	
		
 
        @selection.hover(uri)

			




	
	
	
		
 
        log('enter', uri)

			




	
	
	
		
 
      elem.addEventListener 'mousedown', (ev) =>

			




	
	
	
		
 
        log('click', uri)

			




	
	
	
		
 
        sel = @selection.selected()

			




	
	
	
		
 
        if ev.getModifierState('Control')

			




	
	
	
		
 
          if uri in sel

			




	
	
		
 
@@ -967,7 +974,6 @@ Polymer

			




	
	
	
		
 
          sel = [uri]

			




	
	
	
		
 
        @selection.selected(sel)

			




	
	
	
		
 
      elem.addEventListener 'mouseleave', =>

			




	
	
	
		
 
        log('leave', uri)

			




	
	
	
		
 
        @selection.hover(null)

			




	
	
	
		
 
    elem.setAttribute('d', svgPathFromPoints(curvePts))

			




	
	
	
		
 
    @updateNotePathClasses(uri, elem)

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: kallithea-749ff669b6-v9g5f-75
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support