diff --git a/light9/web/edit-choice.coffee b/light9/web/edit-choice.coffee
--- a/light9/web/edit-choice.coffee
+++ b/light9/web/edit-choice.coffee
@@ -44,11 +44,6 @@ Polymer
properties:
graph: {type: Object, notify: true},
uri: {type: String, notify: true},
- label: {type: String, notify: true}
-
- observers: [
- 'gotGraph(graph, uri)'
- ]
ready: ->
@uri = null
@@ -56,15 +51,6 @@ Polymer
@uri=uri
@updateLabel()
- gotGraph: ->
- @graph.runHandler(@updateLabel.bind(@), "edit-choice #{@uri}")
-
- updateLabel: ->
- @label = try
- @graph.stringValue(@uri, RDFS + 'label')
- catch
- @uri
-
unlink: ->
@uri = null
diff --git a/light9/web/timeline/timeline-elements.html b/light9/web/timeline/timeline-elements.html
--- a/light9/web/timeline/timeline-elements.html
+++ b/light9/web/timeline/timeline-elements.html
@@ -243,6 +243,7 @@
selection="{{selection}}"
song="{{song}}"
uri="{{uri}}"
+ effect="{{effect}}"
>
@@ -282,7 +283,7 @@
note [[noteLabel]]
- effect: | |
+ effect: | |
colorScale: |
|
diff --git a/light9/web/timeline/timeline.coffee b/light9/web/timeline/timeline.coffee
--- a/light9/web/timeline/timeline.coffee
+++ b/light9/web/timeline/timeline.coffee
@@ -400,13 +400,13 @@ Polymer
selection: { type: Object, notify: true }
observers: [
'onGraph(graph, dia, setAdjuster, song, zoomInX)'
- 'observedUpdate(song, rowIndex)'
+ 'observedUpdate(graph, song, rowIndex)'
'onZoom(zoomInX)'
]
onGraph: ->
@graph.runHandler(@update.bind(@), "row notes #{@rowIndex}")
- observedUpdate: (song, rowIndex) ->
+ observedUpdate: (graph, song, rowIndex) ->
@update() # old behavior
#@graph.runHandler(@update.bind(@), "row notes #{@rowIndex}")
@@ -632,7 +632,6 @@ Polymer
uri: { type: String, notify: true } # the Note
rect: { type: Object, notify: true }
effect: { type: String, notify: true }
- effectLabel: { type: String, notify: true }
colorScale: { type: String, notify: true }
noteLabel: { type: String, notify: true }
selection: { type: Object, notify: true }
@@ -679,10 +678,6 @@ Polymer
#console.time('attrs update')
U = (x) => @graph.Uri(x)
@effect = @graph.uriValue(@uri, U(':effectClass'))
- try
- @effectLabel = @graph.stringValue(@effect, U('rdfs:label'))
- catch
- @effectLabel = @effect.replace(/.*\//, '')
@noteLabel = @uri.replace(/.*\//, '')
existingColorScaleSetting = null