TV logo fixed

2014-05-29 15:25:57 +04:00
parent 1730c6fc40
commit 545be98ee4
2 changed files with 550 additions and 495 deletions
--- a/charting_library/static/tv-chart.html
+++ b/charting_library/static/tv-chart.html
@@ -8,6 +8,9 @@
 	<link href="css/site.compiled.css" rel="stylesheet" type="text/css" />
 	<link href="chart-client/css/chartclient.compiled.css" rel="stylesheet" type="text/css" />

+	<link rel="stylesheet" type="text/css" href="css/widget.css" />
+
+
 </head>
 <body class="chart-page on-widget">
 <div class="loading-indicator">
@@ -102,31 +105,83 @@ function createChart() {

 	TradingView.Linking.bindToChartWidgetCollection(chartWidgetCollection);

+	var createLogo = function() {};
+	if (urlParams.logo) {

-	chartWidget.withModel(null, function () {
-		(function createLogo() {
+		createLogo = function () {
+			$('.onchart-custom-logo').remove();
+
+			var filename = (/\.png$/.test(urlParams.logo))
+				? urlParams.logo
+				: urlParams.logo + '.png'
+			;
+			var $logo = $(
+				'<a href="https://www.tradingview.com/" class="onchart-tv-logo" target="_blank">' +
+					'<img src="images/widget-logo/' + filename + '" class="custom-image">' +
+				'</a>'
+			).appendTo('.chart-widget');
+
+			var $img = $logo.find('img');
+
+			var additionLogoParams = ['left','bottom','width','height'];
+			for (var i = additionLogoParams.length - 1; i >= 0; i--) {
+				var param =  additionLogoParams[i];
+				var paramWithPrefix = 'logo_' + param;
+				if (urlParams[paramWithPrefix]) {
+					if (param === 'left' || param === 'bottom') {
+						$logo.css(param, urlParams[paramWithPrefix]);
+					} else {
+						$img.css(param, urlParams[paramWithPrefix]);
+					}
+				}
+			};
+		}
+
+	} else {
+
+		createLogo = function () {
 			$('.onchart-tv-logo').remove();
-			$('.tv-main-panel').append(
-				'<div class="onchart-tv-logo wrapper">'+
+			var colorClass = urlParams.theme ? urlParams.theme.toLowerCase() : ''; // black, white, blue, grey
+			var $logo = $('<div class="onchart-tv-logo wrapper ' + colorClass + '">'+
 					'<div class="wrapper">'+
 						'<a class="inner" href="https://www.tradingview.com/" target="_blank">'+
-
 	
 							'<img class="solid" src="images/logo-widget-copyright.png" alt="TradingView Logo">'+
 							'<img class="faded" src="images/logo-widget-copyright-faded.png" alt="TradingView Logo">'+
 	
-
 							'<span class="text">'+
 								'charts&nbsp;by&nbsp;'+
 								'<span class="logo-highlighted">TradingView</span>'+
 							'</span>'+
 						'</a>'+
 					'</div>'+
-				'</div>'
-			);
-		})();
+				'</div>')
+				.on('mouseenter', function() { $(this).addClass('expanded')    })
+				.on('mouseleave', function() { $(this).removeClass('expanded') })
+				.appendTo('.chart-widget');
+			;

-	});
+			function showAndHideLogo(data) {
+				if (data.method == 'series_completed') {
+					chartWidget.model().mainSeries().onDataLoaded().unsubscribe(this, showAndHideLogo);
+					setTimeout(function() {
+						$('.onchart-tv-logo').addClass('expanded');
+					}, 0.5 * 1000);
+					setTimeout(function() {
+						var $logo = $('.onchart-tv-logo');
+						if ($logo.is(':not(:hover)')) {
+							$logo.removeClass('expanded');
+						}
+					}, 20 * 1000);
+				}
+			}
+
+			chartWidget.model().mainSeries().onDataLoaded().subscribe(this, showAndHideLogo);
+		};
+
+	}
+
+	chartWidget.withModel(null, createLogo);

 	TradingView.tokenInitialized.resolve();

--- a/charting_library/static/tv-chart.min.js
+++ b/charting_library/static/tv-chart.min.js