aboutsummaryrefslogtreecommitdiff
path: root/extension/lib/util.ts
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2016-01-10 23:52:58 +0100
committerFlorian Dold <florian.dold@gmail.com>2016-01-10 23:52:58 +0100
commitb3f0b76f7f6a8836a20c908b3a22a34c3a13c9b9 (patch)
tree07c6aef1b87386de726ee89734d46a68edb92908 /extension/lib/util.ts
parent473503a246aa7a23539a349710c5549d1d87c147 (diff)
Replace format util with ES6 string templates.
Diffstat (limited to 'extension/lib/util.ts')
-rw-r--r--extension/lib/util.ts55
1 files changed, 0 insertions, 55 deletions
diff --git a/extension/lib/util.ts b/extension/lib/util.ts
deleted file mode 100644
index f2fdb131a..000000000
--- a/extension/lib/util.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- This file is part of TALER
- (C) 2015 GNUnet e.V.
-
- TALER is free software; you can redistribute it and/or modify it under the
- terms of the GNU General Public License as published by the Free Software
- Foundation; either version 3, or (at your option) any later version.
-
- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along with
- TALER; see the file COPYING. If not, If not, see <http://www.gnu.org/licenses/>
- */
-
-'use strict';
-
-/**
- * Parse an amount that is specified like '5.42 EUR'.
- * Returns a {currency,value,fraction} object or null
- * if the input is invalid.
- */
-function amount_parse_pretty(s) {
- let pattern = /(\d+)(.\d+)?\s*([a-zA-Z]+)/;
- let matches = pattern.exec(s);
- if (null == matches) {
- return null;
- }
- return {
- // Always succeeds due to regex
- value: parseInt(matches[1]),
- // Should we warn / fail on lost precision?
- fraction: Math.round(parseFloat(matches[2] || "0") * 1000000),
- currency: matches[3],
- };
-}
-
-
-function format(s: string, ...args: any[]) {
- function r(m, n) {
- let i = parseInt(n);
- return args[i];
- }
- s = s.replace(/{{/g, '{');
- s = s.replace(/}}/g, '}');
- s = s.replace(/{([0-9]+)}/g, r);
- return s;
-}
-
-
-function promiseFinally<T>(p: Promise<T>, fn): Promise<T> {
- return p.then((x) => { fn(); return x; })
- .catch((e) => {fn(); throw e;});
-}