← All changes | classes/Visualizer/Module/Chart.php +10 -65 1.5.5 → 1.5.6 View file →

		@@ -239,10 +239,11 @@
239	239	// enqueue and register scripts and styles
240	240	wp_register_style( 'visualizer-frame', VISUALIZER_ABSURL . 'css/frame.css', array(), Visualizer_Plugin::VERSION );
241	241
242	242	wp_register_script( 'visualizer-frame', VISUALIZER_ABSURL . 'js/frame.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
243		- wp_register_script( 'google-jsapi', '//www.google.com/jsapi', array(), null, true );
244		- wp_register_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'google-jsapi', 'visualizer-frame' ), Visualizer_Plugin::VERSION, true );
	243	+ wp_register_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
	244	+ wp_register_script( 'google-jsapi-old', '//www.google.com/jsapi', array('google-jsapi-new'), null, true );
	245	+ wp_register_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'google-jsapi-old', 'google-jsapi-new', 'visualizer-frame' ), Visualizer_Plugin::VERSION, true );
245	246	wp_register_script( 'visualizer-preview', VISUALIZER_ABSURL . 'js/preview.js', array( 'wp-color-picker', 'visualizer-render' ), Visualizer_Plugin::VERSION, true );
246	247
247	248	// added by Ash/Upwork
248	249	if( defined( 'Visualizer_Pro' ) ){
		@@ -349,70 +350,8 @@
349	350
350	351	wp_iframe( array( $render, 'render') );
351	352	}
352	353
353		- /**
354		- * Handles chart settigns page.
355		- *
356		- * @since 1.0.0
357		- *
358		- * @access private
359		- */
360		- private function _handleSettingsPage() {
361		- if ( $_SERVER['REQUEST_METHOD'] == 'POST' && wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ) ) ) {
362		- if ( $this->_chart->post_status == 'auto-draft' ) {
363		- $this->_chart->post_status = 'publish';
364		- wp_update_post( $this->_chart->to_array() );
365		- }
366		-
367		- update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
368		-
369		- $render = new Visualizer_Render_Page_Send();
370		- $render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
371		-
372		- wp_iframe( array( $render, 'render') );
373		- return;
374		- }
375		-
376		- $data = $this->_getChartArray();
377		-
378		- $sidebar = '';
379		- $sidebar_class = 'Visualizer_Render_Sidebar_Type_' . ucfirst( $data['type'] );
380		- if ( class_exists( $sidebar_class, true ) ) {
381		- $sidebar = new $sidebar_class( $data['settings'] );
382		- $sidebar->__series = $data['series'];
383		- $sidebar->__data = $data['data'];
384		- }
385		-
386		- unset( $data['settings']['width'], $data['settings']['height'] );
387		-
388		- wp_enqueue_style( 'wp-color-picker' );
389		- wp_enqueue_style( 'visualizer-frame' );
390		-
391		- wp_enqueue_script( 'visualizer-preview' );
392		- wp_localize_script( 'visualizer-render', 'visualizer', array(
393		- 'charts' => array(
394		- 'canvas' => $data,
395		- ),
396		- ) );
397		-
398		- $render = new Visualizer_Render_Page_Settings();
399		-
400		- $render->sidebar = $sidebar;
401		- if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) {
402		- $render->button = filter_input( INPUT_GET, 'action' ) == Visualizer_Plugin::ACTION_EDIT_CHART
403		- ? esc_html__( 'Save Chart', Visualizer_Plugin::NAME )
404		- : esc_html__( 'Create Chart', Visualizer_Plugin::NAME );
405		- } else {
406		- $render->button = esc_attr__( 'Insert Chart', Visualizer_Plugin::NAME );
407		- }
408		-
409		- $this->_addAction( 'admin_head', 'renderFlattrScript' );
410		-
411		- wp_iframe( array( $render, 'render') );
412		- }
413		-
414		-
415	354	// changed by Ash/Upwork
416	355	private function _handleDataAndSettingsPage(){
417	356	if ( $_SERVER['REQUEST_METHOD'] == 'POST' && wp_verify_nonce( filter_input( INPUT_GET, 'nonce' ) ) ) {
418	357	if ( $this->_chart->post_status == 'auto-draft' ) {
		@@ -436,9 +375,15 @@
436	375	if ( class_exists( $sidebar_class, true ) ) {
437	376	$sidebar = new $sidebar_class( $data['settings'] );
438	377	$sidebar->__series = $data['series'];
439	378	$sidebar->__data = $data['data'];
440		- }
	379	+ } else {
	380	+ $sidebar = apply_filters("visualizer_pro_chart_type_sidebar", '', $data);
	381	+ if ($sidebar != '') {
	382	+ $sidebar->__series = $data['series'];
	383	+ $sidebar->__data = $data['data'];
	384	+ }
	385	+ }
441	386
442	387	unset( $data['settings']['width'], $data['settings']['height'] );
443	388
444	389	wp_enqueue_style( 'visualizer-frame' );