Merge Master into Translations

scripts/config/pages.pl

@@ -60,8 +60,9 @@ sub all_pages {
         ['paymentagent/transferws',      'cashier/paymentagent_transferws',           'default', 'Payment Agent Transfer'],
         ['paymentagent/withdrawws',      'cashier/paymentagent_withdrawws',           'default', 'Payment Agent Withdrawal'],
 
-        ['jptrading', 'bet/japan',   'default', 'Sharp Prices. Smart Trading.'],
-        ['trading',   'bet/static',  'default', 'Sharp Prices. Smart Trading.'],
+        ['jptrading',    'bet/japan',       'default', 'Sharp Prices. Smart Trading.'],
+        ['trading',      'bet/static',      'default', 'Sharp Prices. Smart Trading.'],
+        ['trading_beta', 'bet/beta/static', 'default', 'Sharp Prices. Smart Trading.'],
 
         ['new_account/virtualws',        'new_account/virtualws',       'default', 'Create New Account'],
         ['new_account/realws',           'new_account/realws',          'default', 'Real Money Account Opening'],
@@ -92,8 +93,9 @@ sub all_pages {
         ['user/reality_check_frequencyws',  'user/reality_check_frequencyws',                 'default', 'Reality Check'],
         ['user/reality_check_summaryws',    'user/reality_check_summaryws',                   'default', 'Reality Check'],
 
-        ['logged_inws',           'global/logged_inws',  undef],
-        ['trade/bet_explanation', 'bet/explanation',     undef],
+        ['logged_inws',                'global/logged_inws',   undef],
+        ['trade/bet_explanation',      'bet/explanation',      undef],
+        ['trade/bet_explanation_beta', 'bet/beta/explanation', undef],
     );
 }
 

src/javascript/binary/common_functions/frontend.js

@@ -566,6 +566,17 @@ function detect_hedging($purpose, $hedging) {
     });
 }
 
+function jqueryuiTabsToDropdown($container) {
+    var $ddl = $('<select/>');
+    $container.find('li a').each(function() {
+        $ddl.append($('<option/>', {text: $(this).text(), value: $(this).attr('href')}));
+    });
+    $ddl.change(function() {
+        $container.find('li a[href="' + $(this).val() + '"]').click();
+    });
+    return $ddl;
+}
+
 $(function() {
     $( "#accordion" ).accordion({
       heightStyle: "content",

src/javascript/binary/static_pages/static_pjax.js

@@ -126,8 +126,15 @@ pjax_config_page('\/login|\/loginid_switch', function() {
 
 pjax_config_page('/trading', function () {
     return {
-        onLoad: function(){TradePage.onLoad();},
-        onUnload: function(){TradePage.onUnload();}
+        onLoad: function(){if(/trading\.html/.test(window.location.pathname)) TradePage.onLoad();},
+        onUnload: function(){if(/trading\.html/.test(window.location.pathname)) TradePage.onUnload();}
+    };
+});
+
+pjax_config_page('/trading_beta', function () {
+    return {
+        onLoad: function(){TradePage_Beta.onLoad();},
+        onUnload: function(){TradePage_Beta.onUnload();}
     };
 });
 

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

@@ -2,6 +2,7 @@ var AssetIndexData = (function() {
     "use strict";
 
     var initSocket = function() {
+        if (TradePage_Beta.is_trading_page()) return;
         BinarySocket.init({
             onmessage: function(msg) {
                 var response = JSON.parse(msg.data);
@@ -12,10 +13,12 @@ var AssetIndexData = (function() {
         });
     };
 
-    var sendRequest = function() {
+    var sendRequest = function(shouldRequestActiveSymbols) {
         initSocket();
+        if(shouldRequestActiveSymbols) {
+            BinarySocket.send({"active_symbols": "brief"});
+        }
 
-        BinarySocket.send({"active_symbols": "brief"});
         BinarySocket.send({"asset_index": 1});
     };
 

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

@@ -6,19 +6,25 @@ var AssetIndexUI = (function() {
         $contents;
     var activeSymbols,
         assetIndex,
-        marketColumns;
+        marketColumns,
+        isFramed;
 
-    var init = function() {
+    var init = function(config) {
         if (japanese_client()) {
-            window.location.href = page.url.url_for('resources');
+            if (!TradePage_Beta.is_trading_page()) {
+                window.location.href = page.url.url_for('resources');
+            }
+            return;
         }
-        Content.populate();
+
         $container = $('#asset-index');
+        if ($container.contents().length) return;
+
+        Content.populate();
         showLoadingImage($container);
-        activeSymbols = null;
-        assetIndex = null;
 
-        AssetIndexData.sendRequest();
+        isFramed = (config && config.framed);
+        if (!assetIndex) AssetIndexData.sendRequest(!activeSymbols);
     };
 
     var populateTable = function() {
@@ -47,6 +53,11 @@ var AssetIndexUI = (function() {
             .append($contents.children());
 
         $container.tabs('destroy').tabs();
+
+        if (isFramed) {
+            $container.find('ul').hide();
+            $('<div/>', {class: 'center-text'}).append(jqueryuiTabsToDropdown($container)).prependTo($container);
+        }
     };
 
     var getSubmarketTable = function(assetItem, symbolInfo) {

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

@@ -2,6 +2,7 @@ var MarketTimesData = (function() {
     "use strict";
 
     var initSocket = function() {
+        if (TradePage_Beta.is_trading_page()) return;
         BinarySocket.init({
             onmessage: function(msg) {
                 var response = JSON.parse(msg.data);

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

@@ -5,17 +5,21 @@ var MarketTimesUI = (function() {
         $container;
     var columns,
         activeSymbols,
-        tradingTimes;
+        tradingTimes,
+        isFramed;
 
-    var init = function() {
-        Content.populate();
+    var init = function(config) {
         $date      = $('#trading-date');
         $container = $('#trading-times');
         columns    = ['Asset', 'Opens', 'Closes', 'Settles', 'UpcomingEvents'];
-        activeSymbols = null;
-        tradingTimes = null;
+
+        if ($container.contents().length) return;
+
+        Content.populate();
         showLoadingImage($container);
-        MarketTimesData.sendRequest('today', true);
+
+        isFramed = (config && config.framed);
+        if (!tradingTimes) MarketTimesData.sendRequest('today', !activeSymbols);
 
         $date.val(moment.utc(new Date()).format('YYYY-MM-DD'));
         $date.datepicker({minDate: 0, maxDate: '+1y', dateFormat: 'yy-mm-dd', autoSize: true});
@@ -60,6 +64,11 @@ var MarketTimesUI = (function() {
             .append($contents.children());
 
         $container.tabs('destroy').tabs();
+
+        if (isFramed) {
+            $container.find('ul').hide();
+            $('<div/>', {class: 'center-text'}).append(jqueryuiTabsToDropdown($container)).prependTo($container);
+        }
     };
 
     var createMarketTables = function(market, isJapanTrading) {

src/javascript/binary/websocket_pages/socket.js

@@ -296,10 +296,11 @@ function BinarySocketClass() {
             clearTimeouts();
 
             if(!manualClosed && wrongAppId !== getAppId()) {
-                if (TradePage.is_trading_page()) {
+                if (TradePage.is_trading_page() || TradePage_Beta.is_trading_page()) {
                     showPriceOverlay();
                     showFormOverlay();
-                    TradePage.onLoad();
+                    if (TradePage.is_trading_page()) TradePage.onLoad();
+                    else TradePage_Beta.onLoad();
                 } else {
                     init(1);
                 }