| @@ -24,23 +24,8 @@ | ||
| 24 | 24 | $('#settings-form textarea[name="manual"]').change(validateJSON).keyup(validateJSON); |
| 25 | 25 | vizSettingsHaveChanged(false); |
| 26 | 26 | }; |
| 27 | 27 | |
| 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 | 28 | $('#settings-button').click(function() { |
| 44 | 29 | $('#settings-form').submit(); |
| 45 | 30 | }); |
| 46 | 31 | |
| @@ -56,14 +41,12 @@ | ||
| 56 | 41 | }; |
| 57 | 42 | // this portion captures if the settings have changed so that tabs can handle that information. |
| 58 | 43 | |
| 59 | 44 | function updateChart() { |
| 60 | - vizUpdateFilterControl(); | |
| 61 | 45 | clearTimeout(timeout); |
| 62 | 46 | timeout = setTimeout(function() { |
| 63 | 47 | var settings = $('#settings-form').serializeObject(); |
| 64 | - settings = JSON.stringify( settings ).replace( /<\/?[^>]+(>|$)/g, '' ); | |
| 65 | - settings = JSON.parse( settings ); | |
| 48 | + | |
| 66 | 49 | delete settings['width']; |
| 67 | 50 | delete settings['height']; |
| 68 | 51 | |
| 69 | 52 | v.charts.canvas.settings = settings; |
| @@ -68,9 +51,9 @@ | ||
| 68 | 51 | |
| 69 | 52 | v.charts.canvas.settings = settings; |
| 70 | 53 | $('body').trigger('visualizer:render:currentchart:update', {visualizer: v}); |
| 71 | 54 | vizSettingsHaveChanged(true); |
| 72 | - }, 1500); | |
| 55 | + }, 1000); | |
| 73 | 56 | } |
| 74 | 57 | |
| 75 | 58 | function validateJSON() { |
| 76 | 59 | $('#visualizer-error-manual').remove(); |