Merge branch 'master' into raunak/financial_assessment

Author: raunakkathuria

src/javascript/binary/websocket_pages/socket.js

@@ -58,7 +58,7 @@ function BinarySocketClass() {
                 data.passthrough = {};
             }
             // temporary check
-            if((data.contracts_for || data.proposal || data.price_stream) && !data.passthrough.hasOwnProperty('dispatch_to')){
+            if((data.contracts_for || data.proposal) && !data.passthrough.hasOwnProperty('dispatch_to')){
                 data.passthrough.req_number = ++req_number;
                 timeouts[req_number] = setTimeout(function(){
                     if(typeof reloadPage === 'function' && data.contracts_for){

src/javascript/binary/websocket_pages/trade/event.js

@@ -367,7 +367,6 @@ var TradingEvents = (function () {
                 BinarySocket.send(params);
                 Price.incrFormId();
                 processForgetProposals();
-                processForgetPriceStream();
             }
         };
 

src/javascript/binary/websocket_pages/trade/message.js

@@ -22,8 +22,6 @@ var Message = (function () {
                 page.client.set_storage_value('currencies', response.payout_currencies);
                 displayCurrencies();
                 Symbols.getSymbols(1);
-            } else if (type === 'price_stream') {
-                processPriceStream(response);
             } else if (type === 'proposal') {
                 processProposal(response);
             } else if (type === 'buy') {

src/javascript/binary/websocket_pages/trade/price.js

@@ -19,7 +19,7 @@ var Price = (function() {
 
     var createProposal = function(typeOfContract) {
         var proposal = {
-            price_stream: 1,
+            proposal: 1,
             subscribe: 1
         };
         var underlying = document.getElementById('underlying'),
@@ -134,7 +134,7 @@ var Price = (function() {
     };
 
     var display = function(details, contractType) {
-        var proposal = details['proposal'] || details['price_stream'];
+        var proposal = details['proposal'];
         var id = proposal ? proposal['id'] : '';
         var params = details['echo_req'];
 
@@ -272,7 +272,7 @@ var Price = (function() {
             purchase.setAttribute('data-payout', proposal['payout']);
             purchase.setAttribute('data-symbol', id);
             for (var key in params) {
-                if (key && key !== 'price_stream' && key !== 'proposal') {
+                if (key && key !== 'proposal') {
                     purchase.setAttribute('data-' + key, params[key]);
                 }
             }

src/javascript/binary/websocket_pages/trade/process.js

@@ -1,4 +1,3 @@
-var price_stream_ids = [];
 /*
  * This function process the active symbols to get markets
  * and underlying list
@@ -93,7 +92,6 @@ function processContract(contracts) {
     'use strict';
     if(contracts.hasOwnProperty('error') && contracts.error.code === 'InvalidSymbol') {
         processForgetProposals();
-        processForgetPriceStream();
         var container = document.getElementById('contract_confirmation_container'),
             message_container = document.getElementById('confirmation_message'),
             confirmation_error = document.getElementById('confirmation_error'),
@@ -246,7 +244,6 @@ function displaySpreads() {
 
 function forgetTradingStreams() {
     processForgetProposals();
-    processForgetPriceStream();
     processForgetTicks();
 }
 /*
@@ -261,18 +258,6 @@ function processForgetProposals() {
     Price.clearMapping();
 }
 
-function processForgetPriceStream() {
-  'use strict';
-  showPriceOverlay();
-  while(price_stream_ids && price_stream_ids.length > 0) {
-      var id = price_stream_ids.pop();
-      if(id && id.length > 0) {
-          BinarySocket.send({"forget": id});
-      }
-  }
-  Price.clearMapping();
-}
-
 /*
  * Function to process and calculate price based on current form
  * parameters or change in form parameters
@@ -283,7 +268,6 @@ function processPriceRequest() {
     page.contents.tooltip.hide_tooltip();
     Price.incrFormId();
     processForgetProposals();
-    processForgetPriceStream();
     showPriceOverlay();
     var types = Contract.contractType()[Contract.form()];
     if (Contract.form() === 'digits') {
@@ -361,19 +345,6 @@ function processProposal(response) {
     }
 }
 
-function processPriceStream(response) {
-    'use strict';
-    var form_id = Price.getFormId();
-    if (response.price_stream && response.price_stream.id && $.inArray(response.price_stream.id, price_stream_ids) < 0) {
-      price_stream_ids.push(response.price_stream.id);
-    }
-    if((response.echo_req.passthrough && response.echo_req.passthrough.form_id===form_id) || response.error){
-        hideOverlayContainer();
-        Price.display(response, Contract.contractType()[Contract.form()]);
-        hidePriceOverlay();
-    }
-}
-
 function processTradingTimesRequest(date) {
     var trading_times = Durations.trading_times();
     if (trading_times.hasOwnProperty(date)) {