From ca336bef57a1f142f6c9485e541231ac1905105b Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>
Date: Sun, 9 Nov 2014 14:43:37 -0800
Subject: [PATCH] Fixed a bug that prevented the service dialog from sending
JSON
---
homeassistant/components/http/frontend.py | 2 +-
homeassistant/components/http/www_static/frontend.html | 6 ++----
.../http/www_static/polymer/event-fire-dialog.html | 2 +-
.../http/www_static/polymer/home-assistant-api.html | 2 --
.../http/www_static/polymer/service-call-dialog.html | 2 +-
5 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/homeassistant/components/http/frontend.py b/homeassistant/components/http/frontend.py
index 600b21cf8d7..cb038c2485f 100644
--- a/homeassistant/components/http/frontend.py
+++ b/homeassistant/components/http/frontend.py
@@ -1,2 +1,2 @@
""" DO NOT MODIFY. Auto-generated by build_frontend script """
-VERSION = "eed02673a7e36fe85f2fa021373d0156"
+VERSION = "560228cee9ffd6de4dfdb5816b2f9a23"
diff --git a/homeassistant/components/http/www_static/frontend.html b/homeassistant/components/http/www_static/frontend.html
index 6eedd9f4040..7c071498a54 100644
--- a/homeassistant/components/http/www_static/frontend.html
+++ b/homeassistant/components/http/www_static/frontend.html
@@ -19139,7 +19139,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
clickFireEvent: function() {
this.api.fire_event(
this.$.inputType.value,
- this.$.inputData.value
+ JSON.parse(this.$.inputData.value)
)
}
});
@@ -19861,7 +19861,7 @@ core-item {
this.api.call_service(
this.$.inputDomain.value,
this.$.inputService.value,
- this.$.inputData.value
+ JSON.parse(this.$.inputData.value)
)
}
});
@@ -20281,8 +20281,6 @@ core-item {
},
fire_event: function(eventType, eventData) {
- eventData = eventData ? JSON.parse(eventData) : "";
-
var successToast = function() {
this.showToast("Event "+eventType+" fired.");
}
diff --git a/homeassistant/components/http/www_static/polymer/event-fire-dialog.html b/homeassistant/components/http/www_static/polymer/event-fire-dialog.html
index dff309b6b07..28711006bc2 100644
--- a/homeassistant/components/http/www_static/polymer/event-fire-dialog.html
+++ b/homeassistant/components/http/www_static/polymer/event-fire-dialog.html
@@ -70,7 +70,7 @@
clickFireEvent: function() {
this.api.fire_event(
this.$.inputType.value,
- this.$.inputData.value
+ JSON.parse(this.$.inputData.value)
)
}
});
diff --git a/homeassistant/components/http/www_static/polymer/home-assistant-api.html b/homeassistant/components/http/www_static/polymer/home-assistant-api.html
index 67adc93efbb..169c97d5cb7 100644
--- a/homeassistant/components/http/www_static/polymer/home-assistant-api.html
+++ b/homeassistant/components/http/www_static/polymer/home-assistant-api.html
@@ -270,8 +270,6 @@
},
fire_event: function(eventType, eventData) {
- eventData = eventData ? JSON.parse(eventData) : "";
-
var successToast = function() {
this.showToast("Event "+eventType+" fired.");
}
diff --git a/homeassistant/components/http/www_static/polymer/service-call-dialog.html b/homeassistant/components/http/www_static/polymer/service-call-dialog.html
index fce95b77a72..e226e5f279c 100644
--- a/homeassistant/components/http/www_static/polymer/service-call-dialog.html
+++ b/homeassistant/components/http/www_static/polymer/service-call-dialog.html
@@ -68,7 +68,7 @@
this.api.call_service(
this.$.inputDomain.value,
this.$.inputService.value,
- this.$.inputData.value
+ JSON.parse(this.$.inputData.value)
)
}
});
--
GitLab