← All changes | classes/Visualizer/Module/Admin.php +382 -83 3.0.5 → 3.1.1 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', 'renderTempaltes' );
	56	+ $this->_addAction( 'admin_footer', 'renderTemplates' );
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 );
		@@ -60,11 +60,126 @@
60	60	$this->_addFilter( 'plugin_action_links', 'getPluginActionLinks', 10, 2 );
61	61	$this->_addFilter( 'visualizer_logger_data', 'getLoggerData' );
62	62	$this->_addFilter( 'visualizer_get_chart_counts', 'getChartCountsByTypeAndMeta' );
63	63	$this->_addFilter( 'visualizer_feedback_review_trigger', 'feedbackReviewTrigger' );
	64	+
	65	+ // revision support.
	66	+ $this->_addFilter( 'wp_revisions_to_keep', 'limitRevisions', null, 10, 2 );
	67	+ $this->_addAction( '_wp_put_post_revision', 'addRevision', null, 10, 1 );
	68	+ $this->_addAction( 'wp_restore_post_revision', 'restoreRevision', null, 10, 2 );
	69	+
	70	+ $this->_addAction( 'admin_init', 'init' );
64	71	}
65	72
66	73	/**
	74	+ * No limits on revisions.
	75	+ */
	76	+ public function limitRevisions( $num, $post ) {
	77	+ if ( Visualizer_Plugin::CPT_VISUALIZER === $post->post_type ) {
	78	+ return -1;
	79	+ }
	80	+ return $num;
	81	+ }
	82	+
	83	+ /**
	84	+ * Add a revision.
	85	+ */
	86	+ public function addRevision( $revision_id ) {
	87	+ $parent_id = wp_is_post_revision( $revision_id );
	88	+ if ( Visualizer_Plugin::CPT_VISUALIZER === get_post_type( $parent_id ) ) {
	89	+ // add the meta data to this revision.
	90	+ $meta = get_post_meta( $parent_id, '', true );
	91	+
	92	+ if ( $meta ) {
	93	+ foreach ( $meta as $key => $value ) {
	94	+ if ( 0 === strpos( $key, 'visualizer' ) ) {
	95	+ add_metadata( 'post', $revision_id, $key, maybe_unserialize( $value[0] ) );
	96	+ }
	97	+ }
	98	+ }
	99	+ }
	100	+ }
	101	+
	102	+ /**
	103	+ * Restore a revision.
	104	+ */
	105	+ public function restoreRevision( $post_id, $revision_id ) {
	106	+ if ( Visualizer_Plugin::CPT_VISUALIZER === get_post_type( $post_id ) ) {
	107	+ // get the meta information from the revision.
	108	+ $meta = get_metadata( 'post', $revision_id, '', true );
	109	+
	110	+ // delete all meta information from the post before adding.
	111	+ $post_meta = get_post_meta( $post_id, '', true );
	112	+ if ( $post_meta ) {
	113	+ foreach ( $meta as $key => $value ) {
	114	+ if ( 0 === strpos( $key, 'visualizer' ) ) {
	115	+ delete_post_meta( $post_id, $key );
	116	+ }
	117	+ }
	118	+ }
	119	+
	120	+ if ( $meta ) {
	121	+ foreach ( $meta as $key => $value ) {
	122	+ if ( 0 === strpos( $key, 'visualizer' ) ) {
	123	+ add_post_meta( $post_id, $key, maybe_unserialize( $value[0] ) );
	124	+ }
	125	+ }
	126	+ }
	127	+ }
	128	+ }
	129	+
	130	+ /**
	131	+ * Admin init.
	132	+ *
	133	+ * @access public
	134	+ */
	135	+ public function init() {
	136	+ if ( current_user_can( 'edit_posts' ) && current_user_can( 'edit_pages' ) && 'true' == get_user_option( 'rich_editing' ) ) {
	137	+ $this->_addFilter( 'mce_external_languages', 'add_tinymce_lang', 10, 1 );
	138	+ $this->_addFilter( 'mce_external_plugins', 'tinymce_plugin', 10, 1 );
	139	+ $this->_addFilter( 'mce_buttons', 'register_mce_button', 10, 1 );
	140	+ }
	141	+ }
	142	+
	143	+ /**
	144	+ * Load plugin translation for - TinyMCE API
	145	+ *
	146	+ * @access public
	147	+ * @param array $arr The tinymce_lang array.
	148	+ * @return array
	149	+ */
	150	+ public function add_tinymce_lang( $arr ) {
	151	+ $ui_lang = VISUALIZER_ABSPATH . '/classes/Visualizer/Module/Language.php';
	152	+ $ui_lang = apply_filters( 'visualizer_ui_lang_filter', $ui_lang );
	153	+ $arr[] = $ui_lang;
	154	+ return $arr;
	155	+ }
	156	+
	157	+ /**
	158	+ * Load custom js options - TinyMCE API
	159	+ *
	160	+ * @access public
	161	+ * @param array $plugin_array The tinymce plugin array.
	162	+ * @return array
	163	+ */
	164	+ public function tinymce_plugin( $plugin_array ) {
	165	+ $plugin_array['visualizer_mce_button'] = VISUALIZER_ABSURL . 'js/mce.js';
	166	+ return $plugin_array;
	167	+ }
	168	+
	169	+ /**
	170	+ * Register new button in the editor
	171	+ *
	172	+ * @access public
	173	+ * @param array $buttons The tinymce buttons array.
	174	+ * @return array
	175	+ */
	176	+ public function register_mce_button( $buttons ) {
	177	+ array_push( $buttons, 'visualizer_mce_button' );
	178	+ return $buttons;
	179	+ }
	180	+
	181	+ /**
67	182	* Whether to show the feedback review or not.
68	183	*
69	184	* @access public
70	185	*/
		@@ -97,14 +212,26 @@
97	212	public function enqueueMediaScripts() {
98	213	global $typenow;
99	214	if ( post_type_supports( $typenow, 'editor' ) ) {
100	215	wp_enqueue_style( 'visualizer-media', VISUALIZER_ABSURL . 'css/media.css', array( 'media-views' ), Visualizer_Plugin::VERSION );
101		- wp_enqueue_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array( 'media-editor' ), null, true );
102		- wp_enqueue_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
103		- wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi-old' ), Visualizer_Plugin::VERSION, true );
	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 );
104	222	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
105	223	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
106	224	wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
	225	+ wp_localize_script(
	226	+ 'visualizer-media-view',
	227	+ 'visualizer',
	228	+ array(
	229	+ 'i10n' => array(
	230	+ 'insert' => __( 'Insert', 'visualizer' ),
	231	+ ),
	232	+ )
	233	+ );
107	234	wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
108	235	wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
109	236	}
110	237	}
		@@ -120,8 +247,9 @@
120	247	*
121	248	* @return array The extended array of media view strings.
122	249	*/
123	250	public function setupMediaViewStrings( $strings ) {
	251	+ $chart_types = self::_getChartTypesLocalized( true, true, true );
124	252	$strings['visualizer'] = array(
125	253	'actions' => array(
126	254	'get_charts' => Visualizer_Plugin::ACTION_GET_CHARTS,
127	255	'delete_chart' => Visualizer_Plugin::ACTION_DELETE_CHART,
		@@ -133,10 +261,10 @@
133	261	'library' => esc_html__( 'From Library', 'visualizer' ),
134	262	'create' => esc_html__( 'Create New', 'visualizer' ),
135	263	),
136	264	'library' => array(
137		- 'filters' => self::_getChartTypesLocalized( true, true ),
138		- 'types' => array_keys( self::_getChartTypesLocalized( true, true ) ),
	265	+ 'filters' => $chart_types,
	266	+ 'types' => array_keys( $chart_types ),
139	267	),
140	268	'nonce' => wp_create_nonce(),
141	269	'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
142	270	);
		@@ -152,59 +280,74 @@
152	280	* @static
153	281	* @access private
154	282	* @return array The associated array of chart types with localized names.
155	283	*/
156		- public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false ) {
157		- $types = array(
158		- 'pie' => array(
159		- 'name' => esc_html__( 'Pie', 'visualizer' ),
	284	+ public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false, $where = null ) {
	285	+ $additional = array();
	286	+ if ( $add_select ) {
	287	+ $additional['select'] = array(
	288	+ 'name' => esc_html__( 'All', 'visualizer' ),
160	289	'enabled' => true,
161		- ),
162		- 'line' => array(
163		- 'name' => esc_html__( 'Line', 'visualizer' ),
164		- 'enabled' => true,
165		- ),
166		- 'area' => array(
167		- 'name' => esc_html__( 'Area', 'visualizer' ),
168		- 'enabled' => true,
169		- ),
170		- 'geo' => array(
171		- 'name' => esc_html__( 'Geo', 'visualizer' ),
172		- 'enabled' => true,
173		- ),
174		- 'bar' => array(
175		- 'name' => esc_html__( 'Bar', 'visualizer' ),
176		- 'enabled' => true,
177		- ),
178		- 'column' => array(
179		- 'name' => esc_html__( 'Column', 'visualizer' ),
180		- 'enabled' => true,
181		- ),
182		- 'gauge' => array(
183		- 'name' => esc_html__( 'Gauge', 'visualizer' ),
184		- 'enabled' => true,
185		- ),
186		- 'scatter' => array(
187		- 'name' => esc_html__( 'Scatter', 'visualizer' ),
188		- 'enabled' => true,
189		- ),
190		- 'candlestick' => array(
191		- 'name' => esc_html__( 'Candlestick', 'visualizer' ),
192		- 'enabled' => true,
193		- ),
194		- // pro types
195		- 'table' => array(
196		- 'name' => esc_html__( 'Table', 'visualizer' ),
197		- 'enabled' => false,
198		- ),
199		- 'timeline' => array(
200		- 'name' => esc_html__( 'Timeline', 'visualizer' ),
201		- 'enabled' => false,
202		- ),
203		- 'combo' => array(
204		- 'name' => esc_html__( 'Combo', 'visualizer' ),
205		- 'enabled' => false,
206		- ),
	290	+ );
	291	+ }
	292	+
	293	+ $types = array_merge(
	294	+ $additional,
	295	+ array(
	296	+ 'dataTable' => array(
	297	+ 'name' => esc_html__( 'Table (New)', 'visualizer' ),
	298	+ 'enabled' => true,
	299	+ ),
	300	+ 'pie' => array(
	301	+ 'name' => esc_html__( 'Pie', 'visualizer' ),
	302	+ 'enabled' => true,
	303	+ ),
	304	+ 'line' => array(
	305	+ 'name' => esc_html__( 'Line', 'visualizer' ),
	306	+ 'enabled' => true,
	307	+ ),
	308	+ 'area' => array(
	309	+ 'name' => esc_html__( 'Area', 'visualizer' ),
	310	+ 'enabled' => true,
	311	+ ),
	312	+ 'geo' => array(
	313	+ 'name' => esc_html__( 'Geo', 'visualizer' ),
	314	+ 'enabled' => true,
	315	+ ),
	316	+ 'bar' => array(
	317	+ 'name' => esc_html__( 'Bar', 'visualizer' ),
	318	+ 'enabled' => true,
	319	+ ),
	320	+ 'column' => array(
	321	+ 'name' => esc_html__( 'Column', 'visualizer' ),
	322	+ 'enabled' => true,
	323	+ ),
	324	+ 'scatter' => array(
	325	+ 'name' => esc_html__( 'Scatter', 'visualizer' ),
	326	+ 'enabled' => true,
	327	+ ),
	328	+ 'gauge' => array(
	329	+ 'name' => esc_html__( 'Gauge', 'visualizer' ),
	330	+ 'enabled' => true,
	331	+ ),
	332	+ 'candlestick' => array(
	333	+ 'name' => esc_html__( 'Candlestick', 'visualizer' ),
	334	+ 'enabled' => true,
	335	+ ),
	336	+ // pro types
	337	+ 'table' => array(
	338	+ 'name' => esc_html__( 'Table (Deprecated)', 'visualizer' ),
	339	+ 'enabled' => false,
	340	+ ),
	341	+ 'timeline' => array(
	342	+ 'name' => esc_html__( 'Timeline', 'visualizer' ),
	343	+ 'enabled' => false,
	344	+ ),
	345	+ 'combo' => array(
	346	+ 'name' => esc_html__( 'Combo', 'visualizer' ),
	347	+ 'enabled' => false,
	348	+ ),
	349	+ )
207	350	);
208	351	$types = apply_filters( 'visualizer_pro_chart_types', $types );
209	352	if ( $enabledOnly ) {
210	353	$filtered = array();
		@@ -231,8 +374,83 @@
231	374	}
232	375	$types = $doubleD;
233	376	}
234	377
	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	+
235	453	return $types;
236	454	}
237	455
238	456	/**
		@@ -242,9 +460,9 @@
242	460	* @global string $pagenow The name of the current page.
243	461	*
244	462	* @access public
245	463	*/
246		- public function renderTempaltes() {
	464	+ public function renderTemplates() {
247	465	global $pagenow;
248	466	if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
249	467	return;
250	468	}
		@@ -269,21 +487,35 @@
269	487	wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION );
270	488	$this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' );
271	489	wp_enqueue_media();
272	490	wp_enqueue_script(
273		- 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array(
	491	+ 'visualizer-library',
	492	+ VISUALIZER_ABSURL . 'js/library.js',
	493	+ array(
274	494	'jquery',
275	495	'media-views',
276		- ), Visualizer_Plugin::VERSION, true
	496	+ ),
	497	+ Visualizer_Plugin::VERSION,
	498	+ true
277	499	);
278		- wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true );
279		- wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true );
280		- wp_enqueue_script(
281		- 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array(
282		- 'google-jsapi-old',
283		- 'visualizer-library',
284		- ), Visualizer_Plugin::VERSION, true
285		- );
	500	+
	501	+ 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	+ }
286	518	}
287	519	}
288	520
289	521	/**
		@@ -316,18 +548,22 @@
316	548	$this->_libraryPage = add_submenu_page( 'upload.php', $title, $title, 'edit_posts', Visualizer_Plugin::NAME, $callback );
317	549	}
318	550
319	551	/**
320		- * Renders visualizer library page.
321		- *
322		- * @since 1.0.0
323		- *
324		- * @access public
	552	+ * Get the instance of WP_Query that fetches the charts as per the given criteria.
325	553	*/
326		- public function renderLibraryPage() {
	554	+ private function getQuery() {
	555	+ static $q;
	556	+ if ( ! is_null( $q ) ) {
	557	+ return $q;
	558	+ }
	559	+
327	560	// get current page
328	561	$page = filter_input(
329		- INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array(
	562	+ INPUT_GET,
	563	+ 'vpage',
	564	+ FILTER_VALIDATE_INT,
	565	+ array(
330	566	'options' => array(
331	567	'min_range' => 1,
332	568	'default' => 1,
333	569	),
		@@ -363,33 +599,91 @@
363	599	$meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array();
364	600	$meta[] = $query;
365	601	$query_args['meta_query'] = $meta;
366	602	}
367		- // Added by Ash/Upwork
368		- // fetch charts
	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() {
369	615	$charts = array();
370		- $query = new WP_Query( $query_args );
	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 = '';
371	637	while ( $query->have_posts() ) {
372	638	$chart = $query->next_post();
	639	+
	640	+ // 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	+ $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	+
	645	+ $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
	646	+
373	647	// fetch and update settings
374	648	$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	+
375	655	unset( $settings['height'], $settings['width'] );
376		- $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
377	656	$series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type );
378	657	$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	+
379	668	// add chart to the array
380		- $charts[ 'visualizer-' . $chart->ID ] = array(
	669	+ $charts[ $id ] = array(
381	670	'id' => $chart->ID,
382	671	'type' => $type,
383	672	'series' => $series,
384	673	'settings' => $settings,
385	674	'data' => $data,
	675	+ 'library' => $library,
386	676	);
387	677	}
388	678	// enqueue charts array
389	679	$ajaxurl = admin_url( 'admin-ajax.php' );
390	680	wp_localize_script(
391		- 'visualizer-library', 'visualizer', array(
	681	+ 'visualizer-library',
	682	+ 'visualizer',
	683	+ array(
	684	+ 'language' => $this->get_language(),
	685	+ 'map_api_key' => get_option( 'visualizer-map-api-key' ),
392	686	'charts' => $charts,
393	687	'urls' => array(
394	688	'base' => add_query_arg( 'vpage', false ),
395	689	'create' => add_query_arg(
		@@ -395,17 +689,21 @@
395	689	'create' => add_query_arg(
396	690	array(
397	691	'action' => Visualizer_Plugin::ACTION_CREATE_CHART,
398	692	'library' => 'yes',
399		- ), $ajaxurl
	693	+ 'type' => isset( $_GET['type'] ) ? $_GET['type'] : '',
	694	+ ),
	695	+ $ajaxurl
400	696	),
401	697	'edit' => add_query_arg(
402	698	array(
403	699	'action' => Visualizer_Plugin::ACTION_EDIT_CHART,
404	700	'library' => 'yes',
405		- ), $ajaxurl
	701	+ ),
	702	+ $ajaxurl
406	703	),
407	704	),
	705	+ 'page_type' => 'library',
408	706	)
409	707	);
410	708	// render library page
411	709	$render = new Visualizer_Render_Library();
		@@ -410,9 +708,10 @@
410	708	// render library page
411	709	$render = new Visualizer_Render_Library();
412	710	$render->charts = $charts;
413	711	$render->type = $filter;
414		- $render->types = self::_getChartTypesLocalized();
	712	+ $render->types = self::_getChartTypesLocalized( false, false, false, true );
	713	+ $render->custom_css = $css;
415	714	$render->pagination = paginate_links(
416	715	array(
417	716	'base' => add_query_arg( 'vpage', '%#%' ),
418	717	'format' => '',