← All changes | classes/Visualizer/Module/Admin.php +36 -175 3.1.1 → 3.0.12 View file →

		@@ -52,9 +52,9 @@
52	52	public function __construct( Visualizer_Plugin $plugin ) {
53	53	parent::__construct( $plugin );
54	54	$this->_addAction( 'load-post.php', 'enqueueMediaScripts' );
55	55	$this->_addAction( 'load-post-new.php', 'enqueueMediaScripts' );
56		- $this->_addAction( 'admin_footer', 'renderTemplates' );
	56	+ $this->_addAction( 'admin_footer', 'renderTempaltes' );
57	57	$this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts', null, 8 );
58	58	$this->_addAction( 'admin_menu', 'registerAdminMenu' );
59	59	$this->_addFilter( 'media_view_strings', 'setupMediaViewStrings' );
60	60	$this->_addFilter( 'plugin_action_links', 'getPluginActionLinks', 10, 2 );
		@@ -212,14 +212,11 @@
212	212	public function enqueueMediaScripts() {
213	213	global $typenow;
214	214	if ( post_type_supports( $typenow, 'editor' ) ) {
215	215	wp_enqueue_style( 'visualizer-media', VISUALIZER_ABSURL . 'css/media.css', array( 'media-views' ), Visualizer_Plugin::VERSION );
216		-
217		- // Load all the assets for the different libraries we support.
218		- $deps = Visualizer_Render_Sidebar_Google::enqueue_assets( array( 'media-editor' ) );
219		- $deps += Visualizer_Render_Sidebar_Type_DataTable::enqueue_assets( array( 'media-editor' ) );
220		-
221		- wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', $deps, Visualizer_Plugin::VERSION, true );
	216	+ wp_enqueue_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array( 'media-editor' ), null, true );
	217	+ wp_enqueue_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
	218	+ wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi-old' ), Visualizer_Plugin::VERSION, true );
222	219	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
223	220	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
224	221	wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
225	222	wp_localize_script(
		@@ -280,9 +277,9 @@
280	277	* @static
281	278	* @access private
282	279	* @return array The associated array of chart types with localized names.
283	280	*/
284		- public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false, $where = null ) {
	281	+ public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false ) {
285	282	$additional = array();
286	283	if ( $add_select ) {
287	284	$additional['select'] = array(
288	285	'name' => esc_html__( 'All', 'visualizer' ),
		@@ -292,12 +289,8 @@
292	289
293	290	$types = array_merge(
294	291	$additional,
295	292	array(
296		- 'dataTable' => array(
297		- 'name' => esc_html__( 'Table (New)', 'visualizer' ),
298		- 'enabled' => true,
299		- ),
300	293	'pie' => array(
301	294	'name' => esc_html__( 'Pie', 'visualizer' ),
302	295	'enabled' => true,
303	296	),
		@@ -320,16 +313,16 @@
320	313	'column' => array(
321	314	'name' => esc_html__( 'Column', 'visualizer' ),
322	315	'enabled' => true,
323	316	),
	317	+ 'gauge' => array(
	318	+ 'name' => esc_html__( 'Gauge', 'visualizer' ),
	319	+ 'enabled' => true,
	320	+ ),
324	321	'scatter' => array(
325	322	'name' => esc_html__( 'Scatter', 'visualizer' ),
326	323	'enabled' => true,
327	324	),
328		- 'gauge' => array(
329		- 'name' => esc_html__( 'Gauge', 'visualizer' ),
330		- 'enabled' => true,
331		- ),
332	325	'candlestick' => array(
333	326	'name' => esc_html__( 'Candlestick', 'visualizer' ),
334	327	'enabled' => true,
335	328	),
		@@ -334,9 +327,9 @@
334	327	'enabled' => true,
335	328	),
336	329	// pro types
337	330	'table' => array(
338		- 'name' => esc_html__( 'Table (Deprecated)', 'visualizer' ),
	331	+ 'name' => esc_html__( 'Table', 'visualizer' ),
339	332	'enabled' => false,
340	333	),
341	334	'timeline' => array(
342	335	'name' => esc_html__( 'Timeline', 'visualizer' ),
		@@ -374,83 +367,8 @@
374	367	}
375	368	$types = $doubleD;
376	369	}
377	370
378		- return self::handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where );
379		- }
380		-
381		- /**
382		- * Handle (soon-to-be) deprecated charts.
383		- */
384		- private static function handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where ) {
385		- $deprecated = array();
386		-
387		- switch ( $where ) {
388		- case 'library':
389		- // if the user has a Google Table chart, show it as deprecated otherwise remove the option from the library.
390		- if ( ! self::hasChartType( 'table' ) ) {
391		- $deprecated[] = 'table';
392		- if ( $get2Darray ) {
393		- $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
394		- } else {
395		- $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
396		- }
397		- }
398		-
399		- // if a user has a Gauge/Candlestick chart, then let them keep using it.
400		- if ( ! VISUALIZER_PRO ) {
401		- if ( ! self::hasChartType( 'gauge' ) ) {
402		- if ( $get2Darray ) {
403		- $deprecated[] = 'gauge';
404		- } else {
405		- $types['gauge']['enabled'] = false;
406		- }
407		- }
408		- if ( ! self::hasChartType( 'candlestick' ) ) {
409		- if ( $get2Darray ) {
410		- $deprecated[] = 'candlestick';
411		- } else {
412		- $types['candlestick']['enabled'] = false;
413		- }
414		- }
415		- }
416		- break;
417		- default:
418		- // remove the option to create a Google Table chart.
419		- $deprecated[] = 'table';
420		-
421		- // rename the new table chart type.
422		- if ( $get2Darray ) {
423		- $types['dataTable'] = esc_html__( 'Table', 'visualizer' );
424		- } else {
425		- $types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
426		- }
427		-
428		- // if a user has a Gauge/Candlestick chart, then let them keep using it.
429		- if ( ! VISUALIZER_PRO ) {
430		- if ( ! self::hasChartType( 'gauge' ) ) {
431		- if ( $get2Darray ) {
432		- $deprecated[] = 'gauge';
433		- } else {
434		- $types['gauge']['enabled'] = false;
435		- }
436		- }
437		- if ( ! self::hasChartType( 'candlestick' ) ) {
438		- if ( $get2Darray ) {
439		- $deprecated[] = 'candlestick';
440		- } else {
441		- $types['candlestick']['enabled'] = false;
442		- }
443		- }
444		- }
445		- }
446		-
447		- if ( $deprecated ) {
448		- foreach ( $deprecated as $type ) {
449		- unset( $types[ $type ] );
450		- }
451		- }
452		-
453	371	return $types;
454	372	}
455	373
456	374	/**
		@@ -460,9 +378,9 @@
460	378	* @global string $pagenow The name of the current page.
461	379	*
462	380	* @access public
463	381	*/
464		- public function renderTemplates() {
	382	+ public function renderTempaltes() {
465	383	global $pagenow;
466	384	if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
467	385	return;
468	386	}
		@@ -496,26 +414,22 @@
496	414	),
497	415	Visualizer_Plugin::VERSION,
498	416	true
499	417	);
500		-
	418	+ wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
	419	+ wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
501	420	wp_enqueue_script( 'visualizer-customization', $this->get_user_customization_js(), array(), null, true );
502		-
503		- $query = $this->getQuery();
504		- while ( $query->have_posts() ) {
505		- $chart = $query->next_post();
506		- $library = $this->load_chart_type( $chart->ID );
507		- if ( is_null( $library ) ) {
508		- continue;
509		- }
510		- wp_enqueue_script(
511		- "visualizer-render-$library",
512		- VISUALIZER_ABSURL . 'js/render-facade.js',
513		- apply_filters( 'visualizer_assets_render', array( 'visualizer-library', 'visualizer-customization' ), true ),
514		- Visualizer_Plugin::VERSION,
515		- true
516		- );
517		- }
	421	+ wp_enqueue_script(
	422	+ 'visualizer-render',
	423	+ VISUALIZER_ABSURL . 'js/render.js',
	424	+ array(
	425	+ 'google-jsapi-old',
	426	+ 'visualizer-library',
	427	+ 'visualizer-customization',
	428	+ ),
	429	+ Visualizer_Plugin::VERSION,
	430	+ true
	431	+ );
518	432	}
519	433	}
520	434
521	435	/**
		@@ -548,16 +462,15 @@
548	462	$this->_libraryPage = add_submenu_page( 'upload.php', $title, $title, 'edit_posts', Visualizer_Plugin::NAME, $callback );
549	463	}
550	464
551	465	/**
552		- * Get the instance of WP_Query that fetches the charts as per the given criteria.
	466	+ * Renders visualizer library page.
	467	+ *
	468	+ * @since 1.0.0
	469	+ *
	470	+ * @access public
553	471	*/
554		- private function getQuery() {
555		- static $q;
556		- if ( ! is_null( $q ) ) {
557		- return $q;
558		- }
559		-
	472	+ public function renderLibraryPage() {
560	473	// get current page
561	474	$page = filter_input(
562	475	INPUT_GET,
563	476	'vpage',
		@@ -599,81 +512,31 @@
599	512	$meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
600	513	$meta[] = $query;
601	514	$query_args['meta_query'] = $meta;
602	515	}
603		- $q = new WP_Query( $query_args );
604		- return $q;
605		- }
606		-
607		- /**
608		- * Renders visualizer library page.
609		- *
610		- * @since 1.0.0
611		- *
612		- * @access public
613		- */
614		- public function renderLibraryPage() {
	516	+ // Added by Ash/Upwork
	517	+ // fetch charts
615	518	$charts = array();
616		- $query = $this->getQuery();
617		-
618		- // get current page
619		- $page = filter_input(
620		- INPUT_GET,
621		- 'vpage',
622		- FILTER_VALIDATE_INT,
623		- array(
624		- 'options' => array(
625		- 'min_range' => 1,
626		- 'default' => 1,
627		- ),
628		- )
629		- );
630		- // add chart type filter to the query arguments
631		- $filter = filter_input( INPUT_GET, 'type' );
632		- if ( ! ( $filter && in_array( $filter, Visualizer_Plugin::getChartTypes() ) ) ) {
633		- $filter = 'all';
634		- }
635		-
636		- $css = '';
	519	+ $query = new WP_Query( $query_args );
637	520	while ( $query->have_posts() ) {
638	521	$chart = $query->next_post();
639	522
640	523	// if the user has updated a chart and instead of saving it, has closed the modal. If the user refreshes, they should get the original chart.
641	524	$chart = $this->handleExistingRevisions( $chart->ID, $chart );
642		- // refresh a "live" db query chart.
643		- $chart = apply_filters( 'visualizer_schedule_refresh_chart', $chart, $chart->ID, false );
644	525
645		- $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
646		-
647	526	// fetch and update settings
648	527	$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
649		-
650		- $settings = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SETTINGS, $settings, $chart->ID, $type );
651		- if ( ! empty( $atts['settings'] ) ) {
652		- $settings = apply_filters( $atts['settings'], $settings, $chart->ID, $type );
653		- }
654		-
655	528	unset( $settings['height'], $settings['width'] );
	529	+ $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
656	530	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
657	531	$data = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_DATA, unserialize( html_entity_decode( $chart->post_content ) ), $chart->ID, $type );
658		-
659		- $library = $this->load_chart_type( $chart->ID );
660		-
661		- $id = 'visualizer-' . $chart->ID;
662		- $arguments = $this->get_inline_custom_css( $id, $settings );
663		- if ( ! empty( $arguments ) ) {
664		- $css .= $arguments[0];
665		- $settings = $arguments[1];
666		- }
667		-
668	532	// add chart to the array
669		- $charts[ $id ] = array(
	533	+ $charts[ 'visualizer-' . $chart->ID ] = array(
670	534	'id' => $chart->ID,
671	535	'type' => $type,
672	536	'series' => $series,
673	537	'settings' => $settings,
674	538	'data' => $data,
675		- 'library' => $library,
676	539	);
677	540	}
678	541	// enqueue charts array
679	542	$ajaxurl = admin_url( 'admin-ajax.php' );
		@@ -701,9 +564,8 @@
701	564	),
702	565	$ajaxurl
703	566	),
704	567	),
705		- 'page_type' => 'library',
706	568	)
707	569	);
708	570	// render library page
709	571	$render = new Visualizer_Render_Library();
		@@ -708,10 +570,9 @@
708	570	// render library page
709	571	$render = new Visualizer_Render_Library();
710	572	$render->charts = $charts;
711	573	$render->type = $filter;
712		- $render->types = self::_getChartTypesLocalized( false, false, false, true );
713		- $render->custom_css = $css;
	574	+ $render->types = self::_getChartTypesLocalized();
714	575	$render->pagination = paginate_links(
715	576	array(
716	577	'base' => add_query_arg( 'vpage', '%#%' ),
717	578	'format' => '',