Placeholder support for displayPrompt

This commit is contained in:
shortcutme 2017-05-11 17:55:09 +02:00
parent f183e756f3
commit a9b9902e60
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE

View file

@ -56,7 +56,7 @@ class Wrapper
else if cmd == "progress" # Display notification else if cmd == "progress" # Display notification
@actionProgress(message) @actionProgress(message)
else if cmd == "prompt" # Prompt input else if cmd == "prompt" # Prompt input
@displayPrompt message.params[0], message.params[1], message.params[2], (res) => @displayPrompt message.params[0], message.params[1], message.params[2], message.params[3], (res) =>
@ws.response message.id, res @ws.response message.id, res
else if cmd == "confirm" # Confirm action else if cmd == "confirm" # Confirm action
@displayConfirm message.params[0], message.params[1], (res) => @displayConfirm message.params[0], message.params[1], (res) =>
@ -226,10 +226,10 @@ class Wrapper
return false return false
displayPrompt: (message, type, caption, cb) -> displayPrompt: (message, type, caption, placeholder, cb) ->
body = $("<span class='message'>"+message+"</span>") body = $("<span class='message'>"+message+"</span>")
input = $("<input type='#{type}' class='input button-#{type}'/>") # Add input input = $("<input type='#{type}' class='input button-#{type}' placeholder='#{placeholder}'/>") # Add input
input.on "keyup", (e) => # Send on enter input.on "keyup", (e) => # Send on enter
if e.keyCode == 13 if e.keyCode == 13
button.trigger "click" # Response to confirm button.trigger "click" # Response to confirm
@ -250,9 +250,10 @@ class Wrapper
actionPrompt: (message) -> actionPrompt: (message) ->
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 = "OK" caption = if message.params[2] then message.params[2] else "OK"
placeholder = message.params[3]
@displayPrompt message.params[0], type, caption, (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
actionProgress: (message) -> actionProgress: (message) ->