← All changes | classes/Visualizer/Module/Admin.php +52 -125 3.0.7 → 3.0.4 View file →

		@@ -60,64 +60,11 @@
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		- $this->_addAction( 'admin_init', 'init' );
66	64	}
67	65
68	66	/**
69		- * Admin init.
70		- *
71		- * @access public
72		- */
73		- public function init() {
74		- if ( current_user_can( 'edit_posts' ) && current_user_can( 'edit_pages' ) && 'true' == get_user_option( 'rich_editing' ) ) {
75		- $this->_addFilter( 'mce_external_languages', 'add_tinymce_lang', 10, 1 );
76		- $this->_addFilter( 'mce_external_plugins', 'tinymce_plugin', 10, 1 );
77		- $this->_addFilter( 'mce_buttons', 'register_mce_button', 10, 1 );
78		- }
79		- }
80		-
81		- /**
82		- * Load plugin translation for - TinyMCE API
83		- *
84		- * @access public
85		- * @param array $arr The tinymce_lang array.
86		- * @return array
87		- */
88		- public function add_tinymce_lang( $arr ) {
89		- $ui_lang = VISUALIZER_ABSPATH . '/classes/Visualizer/Module/Language.php';
90		- $ui_lang = apply_filters( 'visualizer_ui_lang_filter', $ui_lang );
91		- $arr[] = $ui_lang;
92		- return $arr;
93		- }
94		-
95		- /**
96		- * Load custom js options - TinyMCE API
97		- *
98		- * @access public
99		- * @param array $plugin_array The tinymce plugin array.
100		- * @return array
101		- */
102		- public function tinymce_plugin( $plugin_array ) {
103		- $plugin_array['visualizer_mce_button'] = VISUALIZER_ABSURL . 'js/mce.js';
104		- return $plugin_array;
105		- }
106		-
107		- /**
108		- * Register new button in the editor
109		- *
110		- * @access public
111		- * @param array $buttons The tinymce buttons array.
112		- * @return array
113		- */
114		- public function register_mce_button( $buttons ) {
115		- array_push( $buttons, 'visualizer_mce_button' );
116		- return $buttons;
117		- }
118		-
119		- /**
120	67	* Whether to show the feedback review or not.
121	68	*
122	69	* @access public
123	70	*/
		@@ -156,15 +103,8 @@
156	103	wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi-old' ), Visualizer_Plugin::VERSION, true );
157	104	wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
158	105	wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
159	106	wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
160		- wp_localize_script(
161		- 'visualizer-media-view', 'visualizer', array(
162		- 'i10n' => array(
163		- 'insert' => __( 'Insert', 'visualizer' ),
164		- ),
165		- )
166		- );
167	107	wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
168	108	wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
169	109	}
170	110	}
		@@ -180,9 +120,8 @@
180	120	*
181	121	* @return array The extended array of media view strings.
182	122	*/
183	123	public function setupMediaViewStrings( $strings ) {
184		- $chart_types = self::_getChartTypesLocalized( true, true, true );
185	124	$strings['visualizer'] = array(
186	125	'actions' => array(
187	126	'get_charts' => Visualizer_Plugin::ACTION_GET_CHARTS,
188	127	'delete_chart' => Visualizer_Plugin::ACTION_DELETE_CHART,
		@@ -194,10 +133,10 @@
194	133	'library' => esc_html__( 'From Library', 'visualizer' ),
195	134	'create' => esc_html__( 'Create New', 'visualizer' ),
196	135	),
197	136	'library' => array(
198		- 'filters' => $chart_types,
199		- 'types' => array_keys( $chart_types ),
	137	+ 'filters' => self::_getChartTypesLocalized( true, true ),
	138	+ 'types' => array_keys( self::_getChartTypesLocalized( true, true ) ),
200	139	),
201	140	'nonce' => wp_create_nonce(),
202	141	'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ),
203	142	);
		@@ -213,69 +152,59 @@
213	152	* @static
214	153	* @access private
215	154	* @return array The associated array of chart types with localized names.
216	155	*/
217		- public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false ) {
218		- $additional = array();
219		- if ( $add_select ) {
220		- $additional['select'] = array(
221		- 'name' => esc_html__( 'All', 'visualizer' ),
	156	+ public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false ) {
	157	+ $types = array(
	158	+ 'pie' => array(
	159	+ 'name' => esc_html__( 'Pie', 'visualizer' ),
222	160	'enabled' => true,
223		- );
224		- }
225		-
226		- $types = array_merge(
227		- $additional, array(
228		- 'pie' => array(
229		- 'name' => esc_html__( 'Pie', 'visualizer' ),
230		- 'enabled' => true,
231		- ),
232		- 'line' => array(
233		- 'name' => esc_html__( 'Line', 'visualizer' ),
234		- 'enabled' => true,
235		- ),
236		- 'area' => array(
237		- 'name' => esc_html__( 'Area', 'visualizer' ),
238		- 'enabled' => true,
239		- ),
240		- 'geo' => array(
241		- 'name' => esc_html__( 'Geo', 'visualizer' ),
242		- 'enabled' => true,
243		- ),
244		- 'bar' => array(
245		- 'name' => esc_html__( 'Bar', 'visualizer' ),
246		- 'enabled' => true,
247		- ),
248		- 'column' => array(
249		- 'name' => esc_html__( 'Column', 'visualizer' ),
250		- 'enabled' => true,
251		- ),
252		- 'gauge' => array(
253		- 'name' => esc_html__( 'Gauge', 'visualizer' ),
254		- 'enabled' => true,
255		- ),
256		- 'scatter' => array(
257		- 'name' => esc_html__( 'Scatter', 'visualizer' ),
258		- 'enabled' => true,
259		- ),
260		- 'candlestick' => array(
261		- 'name' => esc_html__( 'Candlestick', 'visualizer' ),
262		- 'enabled' => true,
263		- ),
264		- // pro types
265		- 'table' => array(
266		- 'name' => esc_html__( 'Table', 'visualizer' ),
267		- 'enabled' => false,
268		- ),
269		- 'timeline' => array(
270		- 'name' => esc_html__( 'Timeline', 'visualizer' ),
271		- 'enabled' => false,
272		- ),
273		- 'combo' => array(
274		- 'name' => esc_html__( 'Combo', 'visualizer' ),
275		- 'enabled' => false,
276		- ),
277		- )
	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	+ ),
278	207	);
279	208	$types = apply_filters( 'visualizer_pro_chart_types', $types );
280	209	if ( $enabledOnly ) {
281	210	$filtered = array();
		@@ -459,10 +388,8 @@
459	388	// enqueue charts array
460	389	$ajaxurl = admin_url( 'admin-ajax.php' );
461	390	wp_localize_script(
462	391	'visualizer-library', 'visualizer', array(
463		- 'language' => $this->get_language(),
464		- 'map_api_key' => get_option( 'visualizer-map-api-key' ),
465	392	'charts' => $charts,
466	393	'urls' => array(
467	394	'base' => add_query_arg( 'vpage', false ),
468	395	'create' => add_query_arg(