refactor

public/assets/js/main.js

@@ -13,29 +13,21 @@ $(document).ready(function () {
         $('#saturation').val(data.saturation || 0)
         $('#colortemp').val(data.color_temp || 0)
     }
-    function setCHSB() {
-        $.getJSON('/api/color/chsb/' + $('#colortemp').val() + '/' + $('#hue').val() + '/' + $('#saturation').val() + '/' + $('#brightness').val(), setData)
-    }
-    function setColor() {
-        $.getJSON('/api/color/hex/' + $('#color').val().replace('#', ''))
-    }
     $('.on').on('click', function () {
-        if (parseInt($('.brightness').text()) > 0)
-            url = '/api/on/' + $('.brightness').text()
-        else
-            url = '/api/on'
-        $.getJSON(url, setData)
+        $.getJSON(parseInt($('.brightness').text()) > 0 ? '/api/on/' + $('.brightness').text() : '/api/on', setData)
     })
     $('.off').on('click', function () {
         $.getJSON('/api/off', setData)
     })
     $('form#chsb').on('submit', function (event) {
         event.preventDefault()
-        setCHSB()
+        event.stopPropagation()
+        $.getJSON('/api/color/chsb/' + $('#colortemp').val() + '/' + $('#hue').val() + '/' + $('#saturation').val() + '/' + $('#brightness').val(), setData)
     })
     $('form#colorform').on('submit', function (event) {
         event.preventDefault()
-        setColor()
+        event.stopPropagation()
+        $.getJSON('/api/color/hex/' + $('#color').val().replace('#', ''), setData)
     })
     $.getJSON('/api/info', setData)
 })