Skip to content

Commit 7684b5b

Browse files
ripplefoxripplefox
committed
prepared to release 2.7.2
1 parent acbc040 commit 7684b5b

File tree

9 files changed

+54
-50
lines changed

9 files changed

+54
-50
lines changed

‎js/app.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ myApp.config(function($routeProvider, $httpProvider, $translateProvider, $compil
3737
requiredLogin : false
3838
}
3939
}).when('/', {
40-
templateUrl : 'pages/home.html',
41-
controller : 'HomeCtrl',
40+
templateUrl : 'pages/balance.html',
41+
controller : 'BalanceCtrl',
4242
access : {
4343
requiredLogin : true
4444
}

‎js/controllers.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ myApp.controller("FooterCtrl", [ '$scope', '$rootScope', '$translate', 'SettingF
4545
});
4646
}]);
4747

48+
49+
/* Not use anymore */
4850
myApp.controller("HomeCtrl", ['$scope', '$rootScope',
4951
function($scope, $rootScope) {
5052

‎js/filters.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ myApp.filter('rpcurrency', function($filter) {
6464
return function(input, nativecode) {
6565
var amount = ripple.Amount.from_json(input);
6666
nativecode = nativecode || 'XRP';
67-
return amount.issuer().to_json() ? amount.currency().to_human() : nativecode;
67+
var code = amount.issuer().to_json() ? amount.currency().to_human() : nativecode;
68+
return code.length == 40 ? hexToAscii(code) : code;
69+
6870
}
6971
});
7072

‎js/lang/translate_cn.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ var translate_cn = {
8686
account_loading: '正在解析账号',
8787
sending_to : '正在发送到',
8888
send_done : '发送成功',
89-
not_funded : '未激活。请发送至少20个{{code}}创建该账号。建议发31个或更多。',
89+
not_funded : '未激活。建议发送至少20个{{code}}创建该账号。',
9090
no_send_path : '找不到你和目标账户之间的路径。',
9191
you_sending : '你将把{{code}}发送到',
9292

‎js/lang/translate_jp.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ var translate_jp = {
8686
account_loading: 'アカウントを解析中',
8787
sending_to : '相手へ発送中',
8888
send_done : '送金成功',
89-
not_funded : 'アクティブ化されていません。20枚以上の{{code}}を発送してアカウントを作ってください。31枚以上がお勧めします。',
89+
not_funded : 'アクティブ化されていません。20枚以上の{{code}}を発送してアカウントを作ってください。',
9090
no_send_path : 'あなたと相手アカウント間のパスが見つかりませんでした。',
9191
you_sending : 'あなたは{{code}}を以下のアドレスへ発送します',
9292

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "FoxletRipple",
3-
"version": "2.7.1",
3+
"version": "2.7.2",
44
"description": "RippleFox Client",
55
"main": "main.js",
66
"chromium-args": "--disable-gpu",

‎pages/send.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
<div class="dropdown">
3131
<button class="btn btn-default dropdown-toggle form-control nopadding" ng-disabled="!currencies.length" type="button" data-toggle="dropdown">
3232
<div class="content" style="">
33-
<div class="currency">{{asset.code}} </div>
33+
<div class="currency">{{asset.code | fmtcode}} </div>
3434
<div class="dropdown-addon" ng-show="currencies.length"><i class="fa fa-sort-desc" aria-hidden="true"></i></div>
3535
</div>
3636
</button>
3737
<ul class="dropdown-menu" role="menu">
3838
<li role="presentation"><a role="menuitem" href="" ng-click="pickCode(native.code)">{{native.code}}</a></li>
3939
<li role="presentation" ng-repeat="code in currencies">
40-
<a role="menuitem" href="" ng-click="pickCode(code)">{{code}}</a>
40+
<a role="menuitem" href="" ng-click="pickCode(code)">{{code | fmtcode}}</a>
4141
</li>
4242
</ul>
4343
</div>
@@ -59,7 +59,7 @@
5959
</div>
6060
<div class="row noborder">
6161
<div ng-show="asset.code == native.code" class="col-xs-12 col-sm-6 col-md-6">
62-
<button type="submit" class="btn btn-block btn-success" ng-click="pickPath(asset.code)" ng-disabled="invalid_address || invalid_amount || invalid_tag">{{'send' | translate}} {{asset.code}}</button>
62+
<button type="submit" class="btn btn-block btn-success" ng-click="pickPath(asset.code)" ng-disabled="invalid_address || invalid_amount || invalid_tag">{{'send' | translate}} {{asset.code | fmtcode}}</button>
6363
</div>
6464
</div>
6565
</group>
@@ -105,21 +105,21 @@
105105
<div ng-show="asset.code == native.code && is_federation && extra_fields" class="col-xs-12 col-sm-6 col-md-4">
106106
<div class="am">
107107
<span class="amnt">{{asset.amount}}</span>
108-
<span class="currency">{{asset.code}}</span>
109-
<div class="ex">(<span class="rate">1</span><span class="pair">{{asset.code}}/{{asset.code}}</span>)</div>
108+
<span class="currency">{{asset.code | fmtcode}}</span>
109+
<div class="ex">(<span class="rate">1</span><span class="pair">{{asset.code | fmtcode}}/{{asset.code | fmtcode}}</span>)</div>
110110
</div>
111-
<button type="submit" ng-click="pickPath(asset.code)" class="btn btn-block btn-success">{{'send' | translate}} {{asset.code}}</button>
111+
<button type="submit" ng-click="pickPath(asset.code)" class="btn btn-block btn-success">{{'send' | translate}} {{asset.code | fmtcode}}</button>
112112
</div>
113113

114114
<div class="message" ng-show="!paths.length && asset.code != native.code">{{ 'no_send_path' | translate}}</div>
115115

116116
<div ng-repeat="alt in paths" class="col-xs-12 col-sm-6 col-md-4">
117117
<div class="am">
118118
<span class="amnt">{{alt.value}}</span>
119-
<span class="currency">{{alt.code}}</span>
120-
<div class="ex">(<span class="rate">{{alt.rate}}</span><span class="pair">{{asset.code}}/{{alt.code}}</span>)</div>
119+
<span class="currency">{{alt.code | fmtcode}}</span>
120+
<div class="ex">(<span class="rate">{{alt.rate}}</span><span class="pair">{{asset.code | fmtcode}}/{{alt.code | fmtcode}}</span>)</div>
121121
</div>
122-
<button type="submit" ng-click="pickPath(alt.code)" class="btn btn-block btn-success">{{'send' | translate}} {{alt.code}}</button>
122+
<button type="submit" ng-click="pickPath(alt.code)" class="btn btn-block btn-success">{{'send' | translate}} {{alt.code | fmtcode}}</button>
123123
</div>
124124
</div>
125125
<div class="row pathupdate" ng-show="found">
@@ -157,9 +157,9 @@
157157
<div class="extra" ng-show="real_address && real_address != input_address">{{real_address}}</div>
158158
</div>
159159
<p translate="will_receive">Recipient will receive</p>
160-
<p class="amount_feedback"><span class="value">{{asset.amount}} </span><span class="currency">{{asset.code}}</span></p>
160+
<p class="amount_feedback"><span class="value">{{asset.amount}} </span><span class="currency">{{asset.code | fmtcode}}</span></p>
161161
<p translate="pay_most">You will pay at most</p>
162-
<p class="amount_feedback"><span class="value">{{path.value}} </span><span class="currency">{{path.code}}</span><span ng-show="path.origin">± 1%</span></p>
162+
<p class="amount_feedback"><span class="value">{{path.value}} </span><span class="currency">{{path.code | fmtcode}}</span><span ng-show="path.origin">± 1%</span></p>
163163
<p translate="are_you_sure">Are you sure?</p>
164164
</div>
165165

‎pages/trade.html‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h3 class="island__sub__division__title" translate="counter_asset">Counter asset
2121
</div>
2222
<div class="AssetCard__content">
2323
<div class="AssetCard__header">
24-
<span class="AssetCard__code">{{base_code}}</span>
24+
<span class="AssetCard__code">{{base_code | fmtcode}}</span>
2525
<span class="AssetCard__federation">{{base.name}}</span>
2626
</div>
2727
<p class="AssetCard__issuerAccountId" title="{{__address}}">{{base_issuer}}</p>
@@ -40,7 +40,7 @@ <h3 class="island__sub__division__title" translate="counter_asset">Counter asset
4040
</div>
4141
<div class="AssetCard__content">
4242
<div class="AssetCard__header">
43-
<span class="AssetCard__code">{{counter_code}}</span>
43+
<span class="AssetCard__code">{{counter_code | fmtcode}}</span>
4444
<span class="AssetCard__federation">{{counter.name}}</span>
4545
</div>
4646
<p class="AssetCard__issuerAccountId" title="{{__address}}">{{counter_issuer}}</p>
@@ -105,13 +105,13 @@ <h3 class="island__sub__division__title" translate="counter_asset">Counter asset
105105
<div class="offers_pad row" ng-show="!show_pair">
106106
<div class="bidoffer col-xs-12 col-sm-6">
107107
<div class="listings">
108-
<h3 class="manager_title">{{'buy' | translate}} {{base_code}}</h3>
108+
<h3 class="manager_title">{{'buy' | translate}} {{base_code | fmtcode}}</h3>
109109
<div class="row input-field">
110110
<div class="col-xs-4 input-lable" translate="order_amount">Amount</div>
111111
<div class="col-xs-8">
112112
<div class="input-group">
113113
<input type="text" class="form-control" ng-model="buy_amount" ng-change="calculate('buy_amount')">
114-
<div class="input-group-addon addon-font">{{base_code}}</div>
114+
<div class="input-group-addon addon-font">{{base_code | fmtcode}}</div>
115115
</div>
116116
</div>
117117
</div>
@@ -120,7 +120,7 @@ <h3 class="manager_title">{{'buy' | translate}} {{base_code}}</h3>
120120
<div class="col-xs-8">
121121
<div class="input-group">
122122
<input type="text" class="form-control" ng-model="buy_price" ng-change="calculate('buy_price')">
123-
<div class="input-group-addon addon-font">{{counter_code}}</div>
123+
<div class="input-group-addon addon-font">{{counter_code | fmtcode}}</div>
124124
</div>
125125
</div>
126126
</div>
@@ -129,62 +129,62 @@ <h3 class="manager_title">{{'buy' | translate}} {{base_code}}</h3>
129129
<div class="col-xs-8">
130130
<div class="input-group">
131131
<input type="text" class="form-control" ng-model="buy_volume" ng-change="calculate('buy_volume')">
132-
<div class="input-group-addon addon-font">{{counter_code}}</div>
132+
<div class="input-group-addon addon-font">{{counter_code | fmtcode}}</div>
133133
</div>
134134
</div>
135135
</div>
136136
<div class="row submit-field" ng-hide="fatfingerbuy">
137137
<div class="overview">
138-
{{'you_have' | translate}} {{getBalance(counter_code, counter_issuer)}} {{counter_code}}
138+
{{'you_have' | translate}} {{getBalance(counter_code, counter_issuer)}} {{counter_code | fmtcode}}
139139
</div>
140140
<div class="s-alert s-alert--info" ng-show="buy_state=='submitted'" translate="submitted">Transaction submitted.</div>
141141
<div class="s-alert s-alert--success" ng-show="buy_state=='success'" translate="offer_success">Offer successfully created</div>
142142
<div class="s-alert s-alert--error" ng-show="buy_fail">{{buy_fail}}</div>
143-
<button class="btn btn-success" ng-click="offerWithCheck('buy')" ng-disabled="buying">{{'buy' | translate}} {{base_code}}</button>
143+
<button class="btn btn-success" ng-click="offerWithCheck('buy')" ng-disabled="buying">{{'buy' | translate}} {{base_code | fmtcode}}</button>
144144
</div>
145145
<div class="row submit-field" ng-show="fatfingerbuy">
146146
<div class="s-alert s-alert--warning" translate="fatfinger">CAUTION: Your order is far off from the current market price.</div>
147-
<button class="btn btn-warning" ng-click="offer('buy')">{{'buy' | translate}} {{base_code}}</button>
147+
<button class="btn btn-warning" ng-click="offer('buy')">{{'buy' | translate}} {{base_code | fmtcode}}</button>
148148
<button class="btn btn-default marginleft" ng-click="fatfingerbuy=false">{{'cancel' | translate}}</button>
149149
</div>
150150
</div>
151151
</div>
152152
<div class="askoffer col-xs-12 col-sm-6">
153153
<div class="listings">
154-
<h3 class="manager_title">{{'sell' | translate}} {{base_code}}</h3>
154+
<h3 class="manager_title">{{'sell' | translate}} {{base_code | fmtcode}}</h3>
155155
<div class="row input-field">
156156
<div class="col-xs-4 input-lable" translate="order_amount">Amount</div>
157157
<div class="col-xs-8 input-group">
158158
<input type="text" class="form-control" ng-model="sell_amount" ng-change="calculate('sell_amount')">
159-
<div class="input-group-addon addon-font">{{base_code}}</div>
159+
<div class="input-group-addon addon-font">{{base_code | fmtcode}}</div>
160160
</div>
161161
</div>
162162
<div class="row input-field">
163163
<div class="col-xs-4 input-lable" translate="price_of_each">price_of_each</div>
164164
<div class="col-xs-8 input-group">
165165
<input type="text" class="form-control" ng-model="sell_price" ng-change="calculate('sell_price')">
166-
<div class="input-group-addon addon-font">{{counter_code}}</div>
166+
<div class="input-group-addon addon-font">{{counter_code | fmtcode}}</div>
167167
</div>
168168
</div>
169169
<div class="row input-field">
170170
<div class="col-xs-4 input-lable">{{'order_value' | translate}}</div>
171171
<div class="col-xs-8 input-group">
172172
<input type="text" class="form-control" ng-model="sell_volume" ng-change="calculate('sell_volume')">
173-
<div class="input-group-addon addon-font">{{counter_code}}</div>
173+
<div class="input-group-addon addon-font">{{counter_code | fmtcode}}</div>
174174
</div>
175175
</div>
176176
<div class="row submit-field" ng-hide="fatfingersell">
177177
<div class="overview">
178-
{{'you_have' | translate}} {{getBalance(base_code, base_issuer)}} {{base_code}}
178+
{{'you_have' | translate}} {{getBalance(base_code, base_issuer)}} {{base_code | fmtcode}}
179179
</div>
180180
<div class="s-alert s-alert--info" ng-show="sell_state=='submitted'" translate="submitted">Transaction submitted</div>
181181
<div class="s-alert s-alert--success" ng-show="sell_state=='success'" translate="offer_success">Offer successfully created</div>
182182
<div class="s-alert s-alert--error" ng-show="sell_fail">{{sell_fail}}</div>
183-
<button class="btn btn-success" ng-click="offerWithCheck('sell')" ng-disabled="selling">{{'sell' | translate}} {{base_code}}</button>
183+
<button class="btn btn-success" ng-click="offerWithCheck('sell')" ng-disabled="selling">{{'sell' | translate}} {{base_code | fmtcode}}</button>
184184
</div>
185185
<div class="row submit-field" ng-show="fatfingersell">
186186
<div class="s-alert s-alert--warning" translate="fatfinger">CAUTION: Your order is far off from the current market price.</div>
187-
<button class="btn btn-warning" ng-click="offer('sell')">{{'sell' | translate}} {{base_code}}</button>
187+
<button class="btn btn-warning" ng-click="offer('sell')">{{'sell' | translate}} {{base_code | fmtcode}}</button>
188188
<button class="btn btn-default marginleft" ng-click="fatfingersell=false">{{'cancel' | translate}}</button>
189189
</div>
190190
</div>
@@ -211,9 +211,9 @@ <h3 class="offer_title" translate="your_buy_offers">Your buy offers</h3>
211211
<div class="col-xs-2 right" translate="action">Action</div>
212212
</div>
213213
<div class="row" ng-repeat="item in offers.bid" ng-class="{cancelling: isCancelling(item.id)}">
214-
<div class="col-xs-3 right">{{item.price | fmtnum}} {{item.total.currency}}</div>
215-
<div class="col-xs-3 right">{{item.quantity.value | fmtnum}} {{item.quantity.currency}}</div>
216-
<div class="col-xs-4 right">{{item.total.value | fmtnum}} {{item.total.currency}}</div>
214+
<div class="col-xs-3 right">{{item.price | fmtnum}} {{item.total.currency | fmtcode}}</div>
215+
<div class="col-xs-3 right">{{item.quantity.value | fmtnum}} {{item.quantity.currency | fmtcode}}</div>
216+
<div class="col-xs-4 right">{{item.total.value | fmtnum}} {{item.total.currency | fmtcode}}</div>
217217
<div class="col-xs-2 action">
218218
<i class="fa fa-spinner fa-pulse" ng-show="isCancelling(item.id)"></i>
219219
<a href="javascript:" ng-click="cancel(item.id, 'all')" class="danger">{{'offer_cancel' | translate}}</a>
@@ -233,9 +233,9 @@ <h3 class="offer_title" translate="your_sell_offers">Your sell offers</h3>
233233
<div class="col-xs-2 right" translate="action">Action</div>
234234
</div>
235235
<div class="row" ng-repeat="item in offers.ask" ng-class="{cancelling: isCancelling(item.id)}">
236-
<div class="col-xs-3 right">{{item.price | fmtnum}} {{item.total.currency}}</div>
237-
<div class="col-xs-3 right">{{item.quantity.value | fmtnum}} {{item.quantity.currency}}</div>
238-
<div class="col-xs-4 right">{{item.total.value | fmtnum}} {{item.total.currency}}</div>
236+
<div class="col-xs-3 right">{{item.price | fmtnum}} {{item.total.currency | fmtcode}}</div>
237+
<div class="col-xs-3 right">{{item.quantity.value | fmtnum}} {{item.quantity.currency | fmtcode}}</div>
238+
<div class="col-xs-4 right">{{item.total.value | fmtnum}} {{item.total.currency | fmtcode}}</div>
239239
<div class="col-xs-2 action">
240240
<i class="fa fa-spinner fa-pulse" ng-show="isCancelling(item.id)"></i>
241241
<a href="javascript:" ng-click="cancel(item.id, 'all')" class="danger">{{'offer_cancel' | translate}}</a>
@@ -256,9 +256,9 @@ <h3 class="offer_title" translate="your_sell_offers">Your sell offers</h3>
256256
</div>
257257
<div class="row" ng-repeat="(id, item) in offers.all" ng-class="{cancelling: isCancelling(id)}">
258258
<div class="col-sm-1">{{item.direction | translate}}</div>
259-
<div class="col-sm-3 right">{{item.price | fmtnum}} {{item.total.currency}}</div>
260-
<div class="col-sm-3 right" title="{{item.quantity.counterparty}}">{{item.quantity.value | fmtnum}} {{item.quantity.currency}}</div>
261-
<div class="col-sm-3 right" title="{{item.total.counterparty}}">{{item.total.value | fmtnum}} {{item.total.currency}}</div>
259+
<div class="col-sm-3 right">{{item.price | fmtnum}} {{item.total.currency | fmtcode}}</div>
260+
<div class="col-sm-3 right" title="{{item.quantity.counterparty}}">{{item.quantity.value | fmtnum}} {{item.quantity.currency | fmtcode}}</div>
261+
<div class="col-sm-3 right" title="{{item.total.counterparty}}">{{item.total.value | fmtnum}} {{item.total.currency | fmtcode}}</div>
262262
<div class="col-sm-2 action">
263263
<i class="fa fa-spinner fa-pulse" ng-show="isCancelling(id)"></i>
264264
<a href="javascript:" ng-click="cancel(item.id, 'all')" class="danger">{{'offer_cancel' | translate}}</a>
@@ -279,9 +279,9 @@ <h3 class="offer_title" translate="your_sell_offers">Your sell offers</h3>
279279
<div class="bids col-xs-12 col-sm-6">
280280
<h3 class="title" translate="buy_offers">Buy offers</h3>
281281
<div class="row head" ng-show="book.bids.length">
282-
<div class="col-xs-4">{{'sum' | translate}} <div class="currency">{{base_code}}</div></div>
283-
<div class="col-xs-4">{{'size' | translate}} <div class="currency">{{base_code}}</div></div>
284-
<div class="col-xs-4">{{'bid_price' | translate}}<div class="currency">{{counter_code}}</div></div>
282+
<div class="col-xs-4">{{'sum' | translate}} <div class="currency">{{base_code | fmtcode}}</div></div>
283+
<div class="col-xs-4">{{'size' | translate}} <div class="currency">{{base_code | fmtcode}}</div></div>
284+
<div class="col-xs-4">{{'bid_price' | translate}}<div class="currency">{{counter_code | fmtcode}}</div></div>
285285
</div>
286286
<div class="row" ng-class="{my: item.account == address}" title="{{item.account}}" ng-repeat="item in book.bids" ng-click="pickPrice('bid', item.price)">
287287
<div class="col-xs-4">{{item.depth | number: value_precise}}</div>
@@ -294,9 +294,9 @@ <h3 class="title" translate="buy_offers">Buy offers</h3>
294294
<div class="asks col-xs-12 col-sm-6">
295295
<h3 class="title" translate="sell_offers">Sell offers</h3>
296296
<div class="row head" ng-show="book.asks.length">
297-
<div class="col-xs-4">{{'ask_price' | translate}}<div class="currency">{{counter_code}}</div></div>
298-
<div class="col-xs-4">{{'size' | translate}} <div class="currency">{{base_code}}</div></div>
299-
<div class="col-xs-4">{{'sum' | translate}} <div class="currency">{{base_code}}</div></div>
297+
<div class="col-xs-4">{{'ask_price' | translate}}<div class="currency">{{counter_code | fmtcode}}</div></div>
298+
<div class="col-xs-4">{{'size' | translate}} <div class="currency">{{base_code | fmtcode}}</div></div>
299+
<div class="col-xs-4">{{'sum' | translate}} <div class="currency">{{base_code | fmtcode}}</div></div>
300300
</div>
301301
<div class="row" ng-class="{my: item.account == address}" title="{{item.account}}" ng-repeat="item in book.asks" ng-click="pickPrice('ask', item.price)">
302302
<div class="col-xs-4">{{item.price | number: price_precise}}</div>

0 commit comments

Comments
 (0)