From dfaf0806a0afd7bc33300ef8020f7006ccb3ca56 Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Wed, 29 Jun 2016 12:10:06 +0300 Subject: [PATCH] placeholders --- src/status_im/chat/views/new_message.cljs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/status_im/chat/views/new_message.cljs b/src/status_im/chat/views/new_message.cljs index 737a3f1344..54bb81f2d7 100644 --- a/src/status_im/chat/views/new_message.cljs +++ b/src/status_im/chat/views/new_message.cljs @@ -16,7 +16,7 @@ (for [command staged-commands] ^{:key command} [staged-command-view command])]) -(defn get-options [{:keys [type placeholder]}] +(defn get-options [{:keys [type placeholder]} command-type] (let [options (case (keyword type) :phone {:input-options {:keyboardType :phone-pad} :validator valid-mobile-number?} @@ -24,13 +24,18 @@ :number {:input-options {:keyboardType :numeric}} ;; todo maybe nil is fine for now :) nil #_(throw (js/Error. "Uknown command type")))] - (assoc-in options [:input-options :placeholder] ""))) + (if (= :response command-type) + (if placeholder + (assoc-in options [:input-options :placeholder] placeholder) + options) + (assoc-in options [:input-options :placeholder] "")))) (defview show-input [] [parameter [:get-command-parameter] - command? [:command?]] + command? [:command?] + type [:command-type]] [plain-message-input-view - (when command? (get-options parameter))]) + (when command? (get-options parameter type))]) (defview chat-message-new [] [staged-commands [:get-chat-staged-commands]]