Merge pull request #34 from nirvanatikku/enhancement/improve_tv_chart…

…_init

Enhancement/Improve TV Chart Init

enhancer.js

@@ -24,7 +24,6 @@ const CONSTANTS = {
   color: '#0072ed',
   colMinWidth: '100px',
   tvTrexPrefix: 'BITTREX',
-  tvChartURL: '//s3.tradingview.com/tv.js',
   btcEthTrexApiURL: 'https://bittrex.com/api/v1.1/public/getticker?market=BTC-ETH',
   btcPriceDomExpr: '[data-bind="text:navigation.displayBitcoinUsd"]',
   loginNodeExpr: ".fa-sign-in",
@@ -412,24 +411,14 @@ Enhancer.enhanceMarketHistoryTable = function enhanceMarketHistoryTable(table){
   }
 }
 Enhancer.initTradingViewWidget = function initTradingViewWidget(ticker, tradingViewOpts){
-  const script = document.createElement('script');
-  script.src = CONSTANTS.tvChartURL;
-  script.async = true;
-  script.addEventListener('load', function(){
     let opts = {};
     Object.assign(opts, 
       tradingViewOpts, {
         symbol: ticker,
         container_id: 'tv-chart-'+Enhancer.getTickerQP()
       });
     console.log(opts);
-    let insertTradingViewChartCode = 'new TradingView.widget('+JSON.stringify(opts)+');';
-    const chartScript = document.createElement('script');
-    chartScript.type = 'text/javascript';
-    chartScript.innerText = insertTradingViewChartCode;
-    document.body.appendChild(chartScript);
-  });
-  document.head.appendChild(script);
+    new TradingView.widget(opts);
 }
 Enhancer.getTickerQP = function getTickerQP(){
   let qps = document.location.search.substring(1);
@@ -440,9 +429,8 @@ Enhancer.swapCharts = function swapCharts(tradingViewOpts){
   if(charts.length === 2){ // timeline, orderbook
     // Clean
     let node = charts[0];
-    while (node.firstChild) {
-      node.removeChild(node.firstChild);
-    }
+    let existingChart = node.getElementsByTagName("iframe")[0];
+    existingChart.remove();
     let ticker = Enhancer.getTickerQP();
     let t = ticker.split('-');
     let tradingViewTicker = CONSTANTS.tvTrexPrefix + ':' + t[1] + t[0]; // e.g. BTC-NEO => BITTREX:NEOBTC
@@ -461,7 +449,7 @@ Enhancer.getDataProcessors = function getDataProcessors(proc, opts){
         if(opts.tvChart){
           setTimeout(function(){ 
             Enhancer.swapCharts(opts.tradingViewOpts); 
-          }, 1200);
+          }, 400);
         }
         if(opts.usdVal){
           const marketQp = Enhancer.getTickerQP();

manifest.json

@@ -33,9 +33,9 @@
         "https://*.bittrex.com/Home/Markets*",
         "https://*.bittrex.com/"
       ],
-      "js": ["enhancer.js"],
+      "js": ["enhancer.js", "tv.js"],
       "css": ["enhanced-styles.css"]
     }
   ],
-  "content_security_policy": "default-src 'none'; style-src 'self' 'unsafe-inline'; script-src 'self'; connect-src https://s3.tradingview.com;"
+  "content_security_policy": "default-src 'none'; style-src 'self' 'unsafe-inline'; script-src 'self'; script-src https://*.tradingview.com;"
 }