From ba9cd9b0caecd816ded0fa6491c268cb2fe2d5fa Mon Sep 17 00:00:00 2001 From: shortcutme Date: Tue, 23 May 2017 12:42:02 +0200 Subject: [PATCH] Fix undefined placeholder --- src/Ui/media/Wrapper.coffee | 5 ++++- src/Ui/media/all.js | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Ui/media/Wrapper.coffee b/src/Ui/media/Wrapper.coffee index f87ff197..eae824be 100644 --- a/src/Ui/media/Wrapper.coffee +++ b/src/Ui/media/Wrapper.coffee @@ -253,7 +253,10 @@ class Wrapper message.params = @toHtmlSafe(message.params) # Escape html if message.params[1] then type = message.params[1] else type = "text" caption = if message.params[2] then message.params[2] else "OK" - placeholder = message.params[3] + if message.params[3]? + placeholder = message.params[3] + else + placeholder = "" @displayPrompt message.params[0], type, caption, placeholder, (res) => @sendInner {"cmd": "response", "to": message.id, "result": res} # Response to confirm diff --git a/src/Ui/media/all.js b/src/Ui/media/all.js index 04acc0de..325379e5 100644 --- a/src/Ui/media/all.js +++ b/src/Ui/media/all.js @@ -1167,7 +1167,11 @@ jQuery.extend( jQuery.easing, type = "text"; } caption = message.params[2] ? message.params[2] : "OK"; - placeholder = message.params[3]; + if (message.params[3] != null) { + placeholder = message.params[3]; + } else { + placeholder = ""; + } return this.displayPrompt(message.params[0], type, caption, placeholder, (function(_this) { return function(res) { return _this.sendInner({