light9 Changeset - 717a971132eb

Changeset - 717a971132eb

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Drew Perttula - 7 years ago 2018-06-05 06:55:45
drewp@bigasterisk.com

float vs str values on live
Ignore-this: 9eb228a2a3b2e9cdb4fe821251703268

3 files changed with 8 insertions and 2 deletions:

light9/web/graph.coffee

light9/web/light9-color-picker.html

light9/web/live/live.coffee

0 comments (0 inline, 0 general)

light9/web/graph.coffee

➞

Show inline comments

@@ @@ -285,7 +285,10 @@ class window.SyncedGraph @@
     return hit if hit != undefined
     #log('float miss', s, p)
     ret = parseFloat(@_singleValue(s, p).value)
     v = @_singleValue(s, p).value
     ret = parseFloat(v)
     if isNaN(ret)
       throw new Error("#{s.value} #{p.value} -> #{v} not a float")
     @cachedFloatValues.set(key, ret)
     return ret

light9/web/light9-color-picker.html

➞

Show inline comments

@@ @@ -307,7 +307,9 @@ @@
+     }
      hideLarge() {
        this.$.large.style.display = 'none';
        if (this.color !== undefined) {
        this.readColor(this.color);
+       }
        this.closeTime = Date.now();
+     }
      onEnterSmall(ev) {

light9/web/live/live.coffee

➞

Show inline comments

@@ @@ -132,7 +132,7 @@ coffeeElementSetup(class Light9LiveContr @@
   valuePred: (attr) ->
     U = (x) => @graph.Uri(x)
     scaledAttributeTypes = [U(':color'), U(':brightness'), U(':uv')]
     if attr in scaledAttributeTypes then U(':scaledValue') else U(':value')
+    if [attr.equals(x) for x in scaledAttributeTypes].length then U(':scaledValue') else U(':value')
   onEffect: ->
     U = (x) => @graph.Uri(x)
@@ @@ -149,6 +149,7 @@ coffeeElementSetup(class Light9LiveContr @@
         value = @graph.stringValue(s, pred)
       log('got', devAttr, value)
       window.gather([[dev, devAttr, value]])
       # there's nothing here to set the widgets to these values.
   saveNewEffect: ->
     uriName = @newEffectName.replace(/[^a-zA-Z0-9_]/g, '')

0 comments (0 inline, 0 general)