← All changes | js/preview.js +3 -37 3.10.15 → 3.4.2 View file →

		@@ -1,9 +1,6 @@
1	1	/* global visualizer */
2	2	/* global console */
3		-/* global vizSettingsHaveChanged */
4		-/* global vizHaveSettingsChanged */
5		-
6	3	(function($, v) {
7	4	var timeout;
8	5
9	6	$(document).ready(function() {
		@@ -8,9 +5,9 @@
8	5
9	6	$(document).ready(function() {
10	7	// when data is impported using csv/url, update the hidden data and the advanced settings sidebar.
11	8	// editor and sidebar are both JSON objects
12		- window.vizUpdateHTML = function( editor, sidebar ) {
	9	+ window.updateHTML = function( editor, sidebar ) {
13	10	$('.viz-simple-editor').remove();
14	11	$('#content').append(editor.html);
15	12	$('#settings-form .viz-group').remove();
16	13	$('#settings-form').append(sidebar.html);
		@@ -21,56 +18,25 @@
21	18	change: updateChart,
22	19	clear: updateChart
23	20	});
24	21	$('#settings-form textarea[name="manual"]').change(validateJSON).keyup(validateJSON);
25		- vizSettingsHaveChanged(false);
26	22	};
27	23
28		- // Update google chart filter control.
29		- window.vizUpdateFilterControl = function() {
30		- $( '#control_wrapper_canvas' ).removeClass( 'no-filter' );
31		- var controlsOpt = $( '.vz-controls-opt' ).map(
32		- function() {
33		- var val = $(this).val();
34		- return '' !== val && 'false' !== val ? val : false ;
35		- }
36		- ).get();
37		- controlsOpt = controlsOpt.filter( function(el) { return el; } );
38		- if ( controlsOpt.length === 0 ) {
39		- $( '#control_wrapper_canvas' ).addClass( 'no-filter' ).html('');
40		- }
41		- }
42		-
43	24	$('#settings-button').click(function() {
44	25	$('#settings-form').submit();
45	26	});
46	27
47		- // this portion captures if the settings have changed so that tabs can handle that information.
48		- var viz_settings_have_changed = false;
49		-
50		- window.vizHaveSettingsChanged = function(){
51		- return viz_settings_have_changed;
52		- };
53		-
54		- window.vizSettingsHaveChanged = function(value){
55		- viz_settings_have_changed = value;
56		- };
57		- // this portion captures if the settings have changed so that tabs can handle that information.
58		-
59	28	function updateChart() {
60		- vizUpdateFilterControl();
61	29	clearTimeout(timeout);
62	30	timeout = setTimeout(function() {
63	31	var settings = $('#settings-form').serializeObject();
64		- settings = JSON.stringify( settings ).replace( /<\/?[^>]+(>|$)/g, '' );
65		- settings = JSON.parse( settings );
	32	+
66	33	delete settings['width'];
67	34	delete settings['height'];
68	35
69	36	v.charts.canvas.settings = settings;
70	37	$('body').trigger('visualizer:render:currentchart:update', {visualizer: v});
71		- vizSettingsHaveChanged(true);
72		- }, 1500);
	38	+ }, 1000);
73	39	}
74	40
75	41	function validateJSON() {
76	42	$('#visualizer-error-manual').remove();