← All changes | classes/Visualizer/Module/Admin.php +12 -6 1.5.5 → 1.5.6 View file →

		@@ -138,10 +138,10 @@
138	138	* @static
139	139	* @access private
140	140	* @return array The associated array of chart types with localized names.
141	141	*/
142		- private static function _getChartTypesLocalized() {
143		- return array(
	142	+ public static function _getChartTypesLocalized() {
	143	+ $types = array(
144	144	'all' => esc_html__( 'All', Visualizer_Plugin::NAME ),
145	145	'pie' => esc_html__( 'Pie', Visualizer_Plugin::NAME ),
146	146	'line' => esc_html__( 'Line', Visualizer_Plugin::NAME ),
147	147	'area' => esc_html__( 'Area', Visualizer_Plugin::NAME ),
		@@ -149,10 +149,14 @@
149	149	'bar' => esc_html__( 'Bar', Visualizer_Plugin::NAME ),
150	150	'column' => esc_html__( 'Column', Visualizer_Plugin::NAME ),
151	151	'gauge' => esc_html__( 'Gauge', Visualizer_Plugin::NAME ),
152	152	'scatter' => esc_html__( 'Scatter', Visualizer_Plugin::NAME ),
153		- 'candlestick' => esc_html__( 'Candelstick', Visualizer_Plugin::NAME ),
	153	+ 'candlestick' => esc_html__( 'Candlestick', Visualizer_Plugin::NAME ),
154	154	);
	155	+
	156	+ $types = apply_filters("visualizer_pro_chart_types", $types);
	157	+
	158	+ return $types;
155	159	}
156	160
157	161	/**
158	162	* Enqueues media scripts and styles.
		@@ -168,9 +172,10 @@
168	172
169	173	if ( post_type_supports( $typenow, 'editor' ) ) {
170	174	wp_enqueue_style( 'visualizer-media', VISUALIZER_ABSURL . 'css/media.css', array( 'media-views' ), Visualizer_Plugin::VERSION );
171	175
172		- wp_enqueue_script( 'visualizer-google-jsapi', '//www.google.com/jsapi', array( 'media-editor' ), null, true );
	176	+ wp_enqueue_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array( 'media-editor' ), null, true );
	177	+ wp_enqueue_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
173	178	wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi' ), Visualizer_Plugin::VERSION, true );
174	179	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
175	180	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
176	181	wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
		@@ -248,10 +253,11 @@
248	253	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
249	254
250	255	wp_enqueue_media();
251	256	wp_enqueue_script( 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array( 'jquery', 'media-views' ), Visualizer_Plugin::VERSION, true );
252		- wp_enqueue_script( 'google-jsapi', '//www.google.com/jsapi', array(), null, true );
253		- wp_enqueue_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'google-jsapi', 'visualizer-library' ), Visualizer_Plugin::VERSION, true );
	257	+ wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
	258	+ wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array('google-jsapi-new'), null, true );
	259	+ wp_enqueue_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'google-jsapi-old', 'visualizer-library' ), Visualizer_Plugin::VERSION, true );
254	260	}
255	261	if ( get_bloginfo( 'version' ) < '3.3' )
256	262	return;
257	263