Mercurial > code > home > repos > light9
changeset 1962:d6b7567e8d19
testing image effect graphics on timeline
Ignore-this: ccaf058be152ebd8fa5d50517a157270
| author | Drew Perttula <drewp@bigasterisk.com> |
|---|---|
| date | Thu, 06 Jun 2019 12:00:27 +0000 |
| parents | f77dfa8e82b9 |
| children | 4b856f39d490 |
| files | light9/web/timeline/inline-attrs.html light9/web/timeline/timeline-elements.html light9/web/timeline/timeline.coffee |
| diffstat | 3 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/light9/web/timeline/inline-attrs.html Thu Jun 06 11:59:44 2019 +0000 +++ b/light9/web/timeline/inline-attrs.html Thu Jun 06 12:00:27 2019 +0000 @@ -27,7 +27,7 @@ <light9-color-picker color="{{colorScale}}"></light9-color-picker> </td></tr> </table> - + <img src="/show/dance2019/anim/rainbow1.png"> </template> <script src="inline-attrs.js"></script> </dom-module>
--- a/light9/web/timeline/timeline-elements.html Thu Jun 06 11:59:44 2019 +0000 +++ b/light9/web/timeline/timeline-elements.html Thu Jun 06 12:00:27 2019 +0000 @@ -123,6 +123,9 @@ </light9-timeline-audio> </div> <div id="rows"></div> + <template is="dom-repeat" items="{{imageSamples}}"> + <img src="/show/dance2019/anim/rainbow1.png"> + </template> <template is="dom-repeat" items="{{inlineAttrConfigs}}"> <light9-timeline-note-inline-attrs graph="{{graph}}" project="{{project}}"
--- a/light9/web/timeline/timeline.coffee Thu Jun 06 11:59:44 2019 +0000 +++ b/light9/web/timeline/timeline.coffee Thu Jun 06 12:00:27 2019 +0000 @@ -291,6 +291,7 @@ song: { type: String, notify: true } viewState: { type: Object, notify: true } inlineAttrConfigs: { type: Array, value: [] } # only for inlineattrs that should be displayed + imageSamples: { type: Array, value: [] } @getter_observers: [ '_onGraph(graph, setAdjuster, song, viewState, project)', 'onZoom(viewState)', @@ -316,6 +317,8 @@ ready: -> super.ready() + @imageSamples = ['one'] + @addEventListener('iron-resize', @_onResize.bind(@)) Polymer.RenderStatus.afterNextRender(this, @_onResize.bind(@))