Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.

Commit c04641e

Browse files
ashkanxashkanx
authored
Merge pull request #1519 from binary-com/master
Merge Master into Translations
2 parents 5543b90 + c40106e commit c04641e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+5574
-145
lines changed

‎scripts/config/pages.pl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ sub all_pages {
6060
['paymentagent/transferws', 'cashier/paymentagent_transferws', 'default', 'Payment Agent Transfer'],
6161
['paymentagent/withdrawws', 'cashier/paymentagent_withdrawws', 'default', 'Payment Agent Withdrawal'],
6262

63-
['jptrading', 'bet/japan', 'default', 'Sharp Prices. Smart Trading.'],
64-
['trading', 'bet/static', 'default', 'Sharp Prices. Smart Trading.'],
63+
['jptrading', 'bet/japan', 'default', 'Sharp Prices. Smart Trading.'],
64+
['trading', 'bet/static', 'default', 'Sharp Prices. Smart Trading.'],
65+
['trading_beta', 'bet/beta/static', 'default', 'Sharp Prices. Smart Trading.'],
6566

6667
['new_account/virtualws', 'new_account/virtualws', 'default', 'Create New Account'],
6768
['new_account/realws', 'new_account/realws', 'default', 'Real Money Account Opening'],
@@ -92,8 +93,9 @@ sub all_pages {
9293
['user/reality_check_frequencyws', 'user/reality_check_frequencyws', 'default', 'Reality Check'],
9394
['user/reality_check_summaryws', 'user/reality_check_summaryws', 'default', 'Reality Check'],
9495

95-
['logged_inws', 'global/logged_inws', undef],
96-
['trade/bet_explanation', 'bet/explanation', undef],
96+
['logged_inws', 'global/logged_inws', undef],
97+
['trade/bet_explanation', 'bet/explanation', undef],
98+
['trade/bet_explanation_beta', 'bet/beta/explanation', undef],
9799
);
98100
}
99101

‎src/javascript/binary/common_functions/frontend.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,17 @@ function detect_hedging($purpose, $hedging) {
566566
});
567567
}
568568

569+
function jqueryuiTabsToDropdown($container) {
570+
var $ddl = $('<select/>');
571+
$container.find('li a').each(function() {
572+
$ddl.append($('<option/>', {text: $(this).text(), value: $(this).attr('href')}));
573+
});
574+
$ddl.change(function() {
575+
$container.find('li a[href="' + $(this).val() + '"]').click();
576+
});
577+
return $ddl;
578+
}
579+
569580
$(function() {
570581
$( "#accordion" ).accordion({
571582
heightStyle: "content",

‎src/javascript/binary/static_pages/static_pjax.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,15 @@ pjax_config_page('\/login|\/loginid_switch', function() {
126126

127127
pjax_config_page('/trading', function () {
128128
return {
129-
onLoad: function(){TradePage.onLoad();},
130-
onUnload: function(){TradePage.onUnload();}
129+
onLoad: function(){if(/trading\.html/.test(window.location.pathname)) TradePage.onLoad();},
130+
onUnload: function(){if(/trading\.html/.test(window.location.pathname)) TradePage.onUnload();}
131+
};
132+
});
133+
134+
pjax_config_page('/trading_beta', function () {
135+
return {
136+
onLoad: function(){TradePage_Beta.onLoad();},
137+
onUnload: function(){TradePage_Beta.onUnload();}
131138
};
132139
});
133140

‎src/javascript/binary/websocket_pages/resources/asset_index/asset_indexws.data.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ var AssetIndexData = (function() {
22
"use strict";
33

44
var initSocket = function() {
5+
if (TradePage_Beta.is_trading_page()) return;
56
BinarySocket.init({
67
onmessage: function(msg) {
78
var response = JSON.parse(msg.data);
@@ -12,10 +13,12 @@ var AssetIndexData = (function() {
1213
});
1314
};
1415

15-
var sendRequest = function() {
16+
var sendRequest = function(shouldRequestActiveSymbols) {
1617
initSocket();
18+
if(shouldRequestActiveSymbols) {
19+
BinarySocket.send({"active_symbols": "brief"});
20+
}
1721

18-
BinarySocket.send({"active_symbols": "brief"});
1922
BinarySocket.send({"asset_index": 1});
2023
};
2124

‎src/javascript/binary/websocket_pages/resources/asset_index/asset_indexws.ui.js

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,25 @@ var AssetIndexUI = (function() {
66
$contents;
77
var activeSymbols,
88
assetIndex,
9-
marketColumns;
9+
marketColumns,
10+
isFramed;
1011

11-
var init = function() {
12+
var init = function(config) {
1213
if (japanese_client()) {
13-
window.location.href = page.url.url_for('resources');
14+
if (!TradePage_Beta.is_trading_page()) {
15+
window.location.href = page.url.url_for('resources');
16+
}
17+
return;
1418
}
15-
Content.populate();
19+
1620
$container = $('#asset-index');
21+
if ($container.contents().length) return;
22+
23+
Content.populate();
1724
showLoadingImage($container);
18-
activeSymbols = null;
19-
assetIndex = null;
2025

21-
AssetIndexData.sendRequest();
26+
isFramed = (config && config.framed);
27+
if (!assetIndex) AssetIndexData.sendRequest(!activeSymbols);
2228
};
2329

2430
var populateTable = function() {
@@ -47,6 +53,11 @@ var AssetIndexUI = (function() {
4753
.append($contents.children());
4854

4955
$container.tabs('destroy').tabs();
56+
57+
if (isFramed) {
58+
$container.find('ul').hide();
59+
$('<div/>', {class: 'center-text'}).append(jqueryuiTabsToDropdown($container)).prependTo($container);
60+
}
5061
};
5162

5263
var getSubmarketTable = function(assetItem, symbolInfo) {

‎src/javascript/binary/websocket_pages/resources/market_times/market_timesws.data.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ var MarketTimesData = (function() {
22
"use strict";
33

44
var initSocket = function() {
5+
if (TradePage_Beta.is_trading_page()) return;
56
BinarySocket.init({
67
onmessage: function(msg) {
78
var response = JSON.parse(msg.data);

‎src/javascript/binary/websocket_pages/resources/market_times/market_timesws.ui.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,21 @@ var MarketTimesUI = (function() {
55
$container;
66
var columns,
77
activeSymbols,
8-
tradingTimes;
8+
tradingTimes,
9+
isFramed;
910

10-
var init = function() {
11-
Content.populate();
11+
var init = function(config) {
1212
$date = $('#trading-date');
1313
$container = $('#trading-times');
1414
columns = ['Asset', 'Opens', 'Closes', 'Settles', 'UpcomingEvents'];
15-
activeSymbols = null;
16-
tradingTimes = null;
15+
16+
if ($container.contents().length) return;
17+
18+
Content.populate();
1719
showLoadingImage($container);
18-
MarketTimesData.sendRequest('today', true);
20+
21+
isFramed = (config && config.framed);
22+
if (!tradingTimes) MarketTimesData.sendRequest('today', !activeSymbols);
1923

2024
$date.val(moment.utc(new Date()).format('YYYY-MM-DD'));
2125
$date.datepicker({minDate: 0, maxDate: '+1y', dateFormat: 'yy-mm-dd', autoSize: true});
@@ -60,6 +64,11 @@ var MarketTimesUI = (function() {
6064
.append($contents.children());
6165

6266
$container.tabs('destroy').tabs();
67+
68+
if (isFramed) {
69+
$container.find('ul').hide();
70+
$('<div/>', {class: 'center-text'}).append(jqueryuiTabsToDropdown($container)).prependTo($container);
71+
}
6372
};
6473

6574
var createMarketTables = function(market, isJapanTrading) {

‎src/javascript/binary/websocket_pages/socket.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,10 +296,11 @@ function BinarySocketClass() {
296296
clearTimeouts();
297297

298298
if(!manualClosed && wrongAppId !== getAppId()) {
299-
if (TradePage.is_trading_page()) {
299+
if (TradePage.is_trading_page() || TradePage_Beta.is_trading_page()) {
300300
showPriceOverlay();
301301
showFormOverlay();
302-
TradePage.onLoad();
302+
if (TradePage.is_trading_page()) TradePage.onLoad();
303+
else TradePage_Beta.onLoad();
303304
} else {
304305
init(1);
305306
}

0 commit comments

Comments
 (0)