# HG changeset patch # User Drew Perttula # Date 2017-06-06 06:37:09 # Node ID 97e4f1b5ff19d2c9b3f8500ef5347b0cc2d92522 # Parent 826e295b6a7549c86e87e6ed442cae07885c7d44 choice UI support on live editor Ignore-this: e9bb570f128b05a498d05b4c6b6bcf86 diff --git a/light9/web/lib/bower.json b/light9/web/lib/bower.json --- a/light9/web/lib/bower.json +++ b/light9/web/lib/bower.json @@ -21,7 +21,9 @@ "paper-button": "PolymerElements/paper-button#^1.0.12", "paper-dialog": "PolymerElements/paper-dialog#^1.0.4", "paper-radio-group": "PolymerElements/paper-radio-group#^1.2.2", - "color": "https://github.com/One-com/one-color.git#^3.0.4" + "color": "https://github.com/One-com/one-color.git#^3.0.4", + "paper-listbox": "PolymerElements/paper-listbox#1.1.3", + "paper-item": "PolymerElements/paper-item#1.2.2" }, "resolutions": { "paper-styles": "^1.1.4", diff --git a/light9/web/live/index.html b/light9/web/live/index.html --- a/light9/web/live/index.html +++ b/light9/web/live/index.html @@ -7,6 +7,8 @@ + + @@ -20,6 +22,76 @@ + + + + + diff --git a/light9/web/live/live.coffee b/light9/web/live/live.coffee --- a/light9/web/live/live.coffee +++ b/light9/web/live/live.coffee @@ -101,7 +101,7 @@ Polymer # stick at the last setting if we don't explicitly send the # 0. rx/ry similar though not the exact same deal because of # their remap. - if value == 0 or value == '#000000' + if value == 0 or value == '#000000' or value == null or value == undefined delete @currentSettings[key] else @currentSettings[key] = [dev, devAttr, value] diff --git a/show/dance2017/deviceClass.n3 b/show/dance2017/deviceClass.n3 --- a/show/dance2017/deviceClass.n3 +++ b/show/dance2017/deviceClass.n3 @@ -15,9 +15,9 @@ rdfs:comment "0=none, 1=fastest" . :goboSpeed a :DeviceAttr; rdfs:label "goboSpeed"; :dataType :scalar ; rdfs:comment "0=stopped, 1=rotate the fastest". -:quantumGoboChoice a :DeviceAttr; rdfs:label "quantumGoboChoice"; :dataType :choice; +:quantumGoboChoice a :DeviceAttr; rdfs:label "gobo"; :dataType :choice; :choice :open, :spider, :windmill, :limbo, :brush, :whirlpool, :stars . -:mini15GoboChoice a :DeviceAttr; rdfs:label "mini15GoboChoice"; :dataType :choice; +:mini15GoboChoice a :DeviceAttr; rdfs:label "gobo"; :dataType :choice; :choice :mini15Gobo1, :mini15Gobo2, :mini15Gobo3, :mini15Gobo4, :mini15Gobo5, :mini15Gobo6, :mini15Gobo7, :mini15Gobo8, :mini15Gobo9, :mini15Gobo10 . :goboShake a :DeviceAttr; rdfs:label "goboShake"; :dataType :scalar .