Merge pull request #1563 from mustofa-binary/amam/fix_trackjs_indexof

amam/fix_trackjs_issue

Author: mustofa-binary

src/main.js

@@ -316,7 +316,7 @@ require(["jquery", "jquery-growl"], function($) {
     ["error", "notice", "warning"].forEach(function(name) {
         var perv = $.growl[name].bind($.growl);
         $.growl[name] = function(options) {
-            if (options.message.indexOf("rate limit") > -1) {
+            if (options.message && options.message.indexOf("rate limit") > -1) {
                 options.message += " Please try again after 1 minute.".i18n();
             }
             if (!options.title) { options.title = ""; /* remove title */ }

src/trade/tradeDialog.es6

@@ -841,7 +841,7 @@ function init_state(available,root, dialog, symbol, contracts_for_spot) {
     const request = {
       proposal: 1,
       subscribe: 1,
-      contract_type: row.contract_type,
+      contract_type: row ? row.contract_type : '',
       currency: state.currency.value, /* This can only be the account-holder's currency */
       symbol: state.proposal.symbol, /* Symbol code */
     };

src/windows/windows.es6

@@ -163,11 +163,15 @@ export const init = function($parentObj) {
    /* wrap jquery ui dialog('destory') to fire an event */
    var original = $.fn.dialog;
    $.fn.dialog = function(cmd) {
-      if(cmd === 'destroy') {
-         this.trigger('dialogdestroy');
-         return original.call(this, 'destroy'); // destroy and remove from dom
+      try {
+         if(cmd === 'destroy') {
+            this.trigger('dialogdestroy');
+            return original.call(this, 'destroy'); // destroy and remove from dom
+         }
+         return original.apply(this, arguments);
+      } catch (err) {
+         $.growl.error({ message: err.message });
       }
-      return original.apply(this, arguments);
    }
 
    require(["charts/chartWindow","websockets/binary_websockets", "navigation/menu", "trade/tradeDialog"], (chartWindowObj,liveapi, menu, tradeDialog) => {