oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix undefined placeholder

Browse source
This commit is contained in:
shortcutme 2017-05-23 12:42:02 +02:00
parent aacde33614
commit ba9cd9b0ca
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Ui/media/Wrapper.coffee
View file

@ -253,7 +253,10 @@ class Wrapper
message.params = @toHtmlSafe(message.params) # Escape html message.params = @toHtmlSafe(message.params) # Escape html
if message.params[1] then type = message.params[1] else type = "text" if message.params[1] then type = message.params[1] else type = "text"
caption = if message.params[2] then message.params[2] else "OK" 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) => @displayPrompt message.params[0], type, caption, placeholder, (res) =>
@sendInner {"cmd": "response", "to": message.id, "result": res} # Response to confirm @sendInner {"cmd": "response", "to": message.id, "result": res} # Response to confirm

6
src/Ui/media/all.js
View file

@ -1167,7 +1167,11 @@ jQuery.extend( jQuery.easing,
type = "text"; type = "text";
} }
caption = message.params[2] ? message.params[2] : "OK"; 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 this.displayPrompt(message.params[0], type, caption, placeholder, (function(_this) {
return function(res) { return function(res) {
return _this.sendInner({ return _this.sendInner({