sync: sync upstream code

Signed-off-by: MiaoWoo <admin@yumc.pw>
2019-07-20 22:30:47 +08:00
parent a981ccbcae
commit 88bae3a4bd
12 changed files with 127 additions and 37 deletions
--- a/src/HTML/JS/wallet-lib.js
+++ b/src/HTML/JS/wallet-lib.js
@@ -347,7 +347,7 @@ function SendMoney2()
    SendMoney();
 };

-function SendMoney()
+function SendMoney(F)
 {
    if(!CanSendTransaction)
    {
@@ -358,7 +358,9 @@ function SendMoney()
    if($("idSendButton").disabled)
        return ;
    SetVisibleBlock("idBlockOnSend", 0);
-    CreateTransaction(SendMoneyTR, true, ClearAttach);
+    if(!F)
+        F = ClearAttach;
+    CreateTransaction(SendMoneyTR, true, F);
 };

 function GetJSONFromTransaction(TR)