← All changes | js/library.js +5 -26 3.10.3 → 3.4.8 View file →

		@@ -41,17 +41,9 @@
41	41	var width = $('#visualizer-library').width(),
42	42	margin = width * 0.02;
43	43
44	44	width *= 0.305;
45		- $(this).prev( '.visualizer-chart-title' ).width(width - 14);
46		- var ChartHeight = width * 0.93;
47		- if ( $( '.visualizer-nochart-canvas' ).length === 0 ) {
48		- ChartHeight = width * 0.78;
49		- if ( $( '#visualizer-sidebar' ).hasClass('one-columns') ) {
50		- ChartHeight = width * 0.92;
51		- }
52		- }
53		- $(this).width(width).height( ChartHeight );
	45	+ $(this).width(width - 14).height(width * 0.75).parent().css('margin-right', margin + 'px').css('margin-bottom', margin + 'px');
54	46	});
55	47	};
56	48
57	49	$('.visualizer-chart-canvas').adjust();
		@@ -56,8 +48,10 @@
56	48
57	49	$('.visualizer-chart-canvas').adjust();
58	50
59	51	$(document).ready(function () {
	52	+ $('.visualizer-chart, .visualizer-library-pagination').fadeIn(500);
	53	+
60	54	// clears the filters in the library form and submits.
61	55	$('#viz-lib-reset').on('click', function(e){
62	56	e.preventDefault();
63	57	$(this).parent('form')[0].reset();
		@@ -91,22 +85,11 @@
91	85	range.select();
92	86	}
93	87	});
94	88
95		- $( '.visualizer-languages-list' ).on( 'click', '[data-lang_code]', function() {
96		- if ( $(this).find( 'i' ).hasClass( 'otgs-ico-add' ) ) {
97		- vu.create = vu.create + '&lang=' + $(this).data('lang_code') + '&parent_chart_id=' + $(this).data('chart');
98		- $('.add-new-chart').click();
99		- } else {
100		- vu.edit = vu.edit + '&lang=' + $(this).data('lang_code') + '&chart=' + $(this).data('chart');
101		- $('.visualizer-chart-edit').click();
102		- }
103		- } );
104		-
105	89	$('.add-new-chart').click(function () {
106	90	var wnd = window,
107	91	view = new vmv.Chart({action: vu.create});
108		- vu.create = vu.create.replace(/[\?&]lang=[^&]+/, '').replace(/[\?&]parent_chart_id=[^&]+/, '');
109	92
110	93	window.parent.addEventListener('message', function(event){
111	94	switch(event.data) {
112	95	case 'visualizer:mediaframe:close':
		@@ -126,13 +109,10 @@
126	109	return false;
127	110	});
128	111
129	112	$('.visualizer-chart-edit').click(function () {
130		- var wnd = window;
131		- var view = new vmv.Chart( {
132		- action: vu.edit.indexOf('&chart') != -1 ? vu.edit : vu.edit + '&chart=' + $(this).attr('data-chart')
133		- } );
134		- vu.edit = vu.edit.replace(/[\?&]lang=[^&]+/, '');
	113	+ var wnd = window,
	114	+ view = new vmv.Chart({action: vu.edit + '&chart=' + $(this).attr('data-chart')});
135	115
136	116	wnd.send_to_editor = function () {
137	117	wnd.location.href = wnd.location.href.replace(/vaction/, '');
138	118	};
		@@ -182,7 +162,6 @@
182	162
183	163	$('.visualizer-error i.error').on('click', function(){
184	164	alert( $(this).attr('data-viz-error') );
185	165	});
186		- $('.visualizer-chart:not(.visualizer-chart-display), .visualizer-library-pagination').fadeIn(500);
187	166	});
188	167	})(jQuery, visualizer.media.view, visualizer.urls);