changeset 1140:3f7de54de79e

on songeffects page, show effect labels Ignore-this: 5a0c30c44ac8faef7482b8a2436de4d0
author drewp@bigasterisk.com
date Sat, 14 Jun 2014 07:27:20 +0000
parents d8b25edf6c74
children a232bc895568
files bin/effecteval light9/effecteval/index.html
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/bin/effecteval	Sat Jun 14 07:21:32 2014 +0000
+++ b/bin/effecteval	Sat Jun 14 07:27:20 2014 +0000
@@ -86,7 +86,7 @@
         out = []
         for s in songs:
             out.append({'uri': s, 'label': self.graph.label(s)})
-            out[-1]['effects'] = [{'uri': uri} for uri in sorted(self.graph.objects(s, L9['effect']))]
+            out[-1]['effects'] = [{'uri': uri, 'label': self.graph.label(uri)} for uri in sorted(self.graph.objects(s, L9['effect']))]
         self.sendMessage({'songs': out})
         
         
--- a/light9/effecteval/index.html	Sat Jun 14 07:21:32 2014 +0000
+++ b/light9/effecteval/index.html	Sat Jun 14 07:27:20 2014 +0000
@@ -15,7 +15,7 @@
         <ul>
           <!-- ko foreach: effects -->
           <li>
-            <a class="effect" data-bind="attr: {href: 'effect?'+jQuery.param({uri: uri})}, text: uri"></a> <button data-bind="click: deleteEffect">Delete</button>
+            <a class="effect" data-bind="attr: {href: 'effect?'+jQuery.param({uri: uri})}, text: label"></a> <button data-bind="click: deleteEffect">Delete</button>
           </li>
           <!-- /ko -->
           <li class="dropTarget" data-bind="event: {dragover: $root.dragover, dragenter: $root.dragover, drop: function(data, event) { $root.drop(uri, event); }}">Add another (drop a sub or effect class)</li>