| @@ -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 ); |
| @@ -60,126 +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 | - // 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' ); | |
| 71 | 64 | } |
| 72 | 65 | |
| 73 | 66 | /** |
| 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 | - /** | |
| 182 | 67 | * Whether to show the feedback review or not. |
| 183 | 68 | * |
| 184 | 69 | * @access public |
| 185 | 70 | */ |
| @@ -194,9 +79,12 @@ | ||
| 194 | 79 | ) |
| 195 | 80 | ); |
| 196 | 81 | |
| 197 | 82 | if ( $query->have_posts() && $query->post_count > 0 ) { |
| 198 | - return true; | |
| 83 | + return array( | |
| 84 | + 'heading' => __( 'Some title from visualizer', 'visualizer' ), | |
| 85 | + 'msg' => __( 'Some msg from visualizer', 'visualizer' ), | |
| 86 | + ); | |
| 199 | 87 | } |
| 200 | 88 | return false; |
| 201 | 89 | } |
| 202 | 90 | |
| @@ -212,26 +100,14 @@ | ||
| 212 | 100 | public function enqueueMediaScripts() { |
| 213 | 101 | global $typenow; |
| 214 | 102 | if ( post_type_supports( $typenow, 'editor' ) ) { |
| 215 | 103 | 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 ); | |
| 104 | + wp_enqueue_script( 'visualizer-google-jsapi-new', '//www.gstatic.com/charts/loader.js', array( 'media-editor' ), null, true ); | |
| 105 | + wp_enqueue_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true ); | |
| 106 | + wp_enqueue_script( 'visualizer-media-model', VISUALIZER_ABSURL . 'js/media/model.js', array( 'visualizer-google-jsapi-old' ), Visualizer_Plugin::VERSION, true ); | |
| 222 | 107 | wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true ); |
| 223 | 108 | wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true ); |
| 224 | 109 | 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 | - ); | |
| 234 | 110 | wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true ); |
| 235 | 111 | wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true ); |
| 236 | 112 | } |
| 237 | 113 | } |
| @@ -247,9 +123,8 @@ | ||
| 247 | 123 | * |
| 248 | 124 | * @return array The extended array of media view strings. |
| 249 | 125 | */ |
| 250 | 126 | public function setupMediaViewStrings( $strings ) { |
| 251 | - $chart_types = self::_getChartTypesLocalized( true, true, true ); | |
| 252 | 127 | $strings['visualizer'] = array( |
| 253 | 128 | 'actions' => array( |
| 254 | 129 | 'get_charts' => Visualizer_Plugin::ACTION_GET_CHARTS, |
| 255 | 130 | 'delete_chart' => Visualizer_Plugin::ACTION_DELETE_CHART, |
| @@ -261,10 +136,10 @@ | ||
| 261 | 136 | 'library' => esc_html__( 'From Library', 'visualizer' ), |
| 262 | 137 | 'create' => esc_html__( 'Create New', 'visualizer' ), |
| 263 | 138 | ), |
| 264 | 139 | 'library' => array( |
| 265 | - 'filters' => $chart_types, | |
| 266 | - 'types' => array_keys( $chart_types ), | |
| 140 | + 'filters' => self::_getChartTypesLocalized( true, true ), | |
| 141 | + 'types' => array_keys( self::_getChartTypesLocalized( true, true ) ), | |
| 267 | 142 | ), |
| 268 | 143 | 'nonce' => wp_create_nonce(), |
| 269 | 144 | 'buildurl' => add_query_arg( 'action', Visualizer_Plugin::ACTION_CREATE_CHART, admin_url( 'admin-ajax.php' ) ), |
| 270 | 145 | ); |
| @@ -280,74 +155,59 @@ | ||
| 280 | 155 | * @static |
| 281 | 156 | * @access private |
| 282 | 157 | * @return array The associated array of chart types with localized names. |
| 283 | 158 | */ |
| 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' ), | |
| 159 | + public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false ) { | |
| 160 | + $types = array( | |
| 161 | + 'pie' => array( | |
| 162 | + 'name' => esc_html__( 'Pie', 'visualizer' ), | |
| 289 | 163 | 'enabled' => true, |
| 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 | - ) | |
| 164 | + ), | |
| 165 | + 'line' => array( | |
| 166 | + 'name' => esc_html__( 'Line', 'visualizer' ), | |
| 167 | + 'enabled' => true, | |
| 168 | + ), | |
| 169 | + 'area' => array( | |
| 170 | + 'name' => esc_html__( 'Area', 'visualizer' ), | |
| 171 | + 'enabled' => true, | |
| 172 | + ), | |
| 173 | + 'geo' => array( | |
| 174 | + 'name' => esc_html__( 'Geo', 'visualizer' ), | |
| 175 | + 'enabled' => true, | |
| 176 | + ), | |
| 177 | + 'bar' => array( | |
| 178 | + 'name' => esc_html__( 'Bar', 'visualizer' ), | |
| 179 | + 'enabled' => true, | |
| 180 | + ), | |
| 181 | + 'column' => array( | |
| 182 | + 'name' => esc_html__( 'Column', 'visualizer' ), | |
| 183 | + 'enabled' => true, | |
| 184 | + ), | |
| 185 | + 'gauge' => array( | |
| 186 | + 'name' => esc_html__( 'Gauge', 'visualizer' ), | |
| 187 | + 'enabled' => true, | |
| 188 | + ), | |
| 189 | + 'scatter' => array( | |
| 190 | + 'name' => esc_html__( 'Scatter', 'visualizer' ), | |
| 191 | + 'enabled' => true, | |
| 192 | + ), | |
| 193 | + 'candlestick' => array( | |
| 194 | + 'name' => esc_html__( 'Candlestick', 'visualizer' ), | |
| 195 | + 'enabled' => true, | |
| 196 | + ), | |
| 197 | + // pro types | |
| 198 | + 'table' => array( | |
| 199 | + 'name' => esc_html__( 'Table', 'visualizer' ), | |
| 200 | + 'enabled' => false, | |
| 201 | + ), | |
| 202 | + 'timeline' => array( | |
| 203 | + 'name' => esc_html__( 'Timeline', 'visualizer' ), | |
| 204 | + 'enabled' => false, | |
| 205 | + ), | |
| 206 | + 'combo' => array( | |
| 207 | + 'name' => esc_html__( 'Combo', 'visualizer' ), | |
| 208 | + 'enabled' => false, | |
| 209 | + ), | |
| 350 | 210 | ); |
| 351 | 211 | $types = apply_filters( 'visualizer_pro_chart_types', $types ); |
| 352 | 212 | if ( $enabledOnly ) { |
| 353 | 213 | $filtered = array(); |
| @@ -374,83 +234,8 @@ | ||
| 374 | 234 | } |
| 375 | 235 | $types = $doubleD; |
| 376 | 236 | } |
| 377 | 237 | |
| 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 | 238 | return $types; |
| 454 | 239 | } |
| 455 | 240 | |
| 456 | 241 | /** |
| @@ -460,9 +245,9 @@ | ||
| 460 | 245 | * @global string $pagenow The name of the current page. |
| 461 | 246 | * |
| 462 | 247 | * @access public |
| 463 | 248 | */ |
| 464 | - public function renderTemplates() { | |
| 249 | + public function renderTempaltes() { | |
| 465 | 250 | global $pagenow; |
| 466 | 251 | if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) { |
| 467 | 252 | return; |
| 468 | 253 | } |
| @@ -487,35 +272,21 @@ | ||
| 487 | 272 | wp_enqueue_style( 'visualizer-library', VISUALIZER_ABSURL . 'css/library.css', array(), Visualizer_Plugin::VERSION ); |
| 488 | 273 | $this->_addFilter( 'media_upload_tabs', 'setupVisualizerTab' ); |
| 489 | 274 | wp_enqueue_media(); |
| 490 | 275 | wp_enqueue_script( |
| 491 | - 'visualizer-library', | |
| 492 | - VISUALIZER_ABSURL . 'js/library.js', | |
| 493 | - array( | |
| 276 | + 'visualizer-library', VISUALIZER_ABSURL . 'js/library.js', array( | |
| 494 | 277 | 'jquery', |
| 495 | 278 | 'media-views', |
| 496 | - ), | |
| 497 | - Visualizer_Plugin::VERSION, | |
| 498 | - true | |
| 279 | + ), Visualizer_Plugin::VERSION, true | |
| 499 | 280 | ); |
| 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 | - } | |
| 281 | + wp_enqueue_script( 'google-jsapi-new', '//www.gstatic.com/charts/loader.js', array(), null, true ); | |
| 282 | + wp_enqueue_script( 'google-jsapi-old', '//www.google.com/jsapi', array( 'google-jsapi-new' ), null, true ); | |
| 283 | + wp_enqueue_script( | |
| 284 | + 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( | |
| 285 | + 'google-jsapi-old', | |
| 286 | + 'visualizer-library', | |
| 287 | + ), Visualizer_Plugin::VERSION, true | |
| 288 | + ); | |
| 518 | 289 | } |
| 519 | 290 | } |
| 520 | 291 | |
| 521 | 292 | /** |
| @@ -548,22 +319,18 @@ | ||
| 548 | 319 | $this->_libraryPage = add_submenu_page( 'upload.php', $title, $title, 'edit_posts', Visualizer_Plugin::NAME, $callback ); |
| 549 | 320 | } |
| 550 | 321 | |
| 551 | 322 | /** |
| 552 | - * Get the instance of WP_Query that fetches the charts as per the given criteria. | |
| 323 | + * Renders visualizer library page. | |
| 324 | + * | |
| 325 | + * @since 1.0.0 | |
| 326 | + * | |
| 327 | + * @access public | |
| 553 | 328 | */ |
| 554 | - private function getQuery() { | |
| 555 | - static $q; | |
| 556 | - if ( ! is_null( $q ) ) { | |
| 557 | - return $q; | |
| 558 | - } | |
| 559 | - | |
| 329 | + public function renderLibraryPage() { | |
| 560 | 330 | // get current page |
| 561 | 331 | $page = filter_input( |
| 562 | - INPUT_GET, | |
| 563 | - 'vpage', | |
| 564 | - FILTER_VALIDATE_INT, | |
| 565 | - array( | |
| 332 | + INPUT_GET, 'vpage', FILTER_VALIDATE_INT, array( | |
| 566 | 333 | 'options' => array( |
| 567 | 334 | 'min_range' => 1, |
| 568 | 335 | 'default' => 1, |
| 569 | 336 | ), |
| @@ -599,91 +366,33 @@ | ||
| 599 | 366 | $meta = isset( $query_args['meta_query'] ) ? $query_args['meta_query'] : array(); |
| 600 | 367 | $meta[] = $query; |
| 601 | 368 | $query_args['meta_query'] = $meta; |
| 602 | 369 | } |
| 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() { | |
| 370 | + // Added by Ash/Upwork | |
| 371 | + // fetch charts | |
| 615 | 372 | $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 = ''; | |
| 373 | + $query = new WP_Query( $query_args ); | |
| 637 | 374 | while ( $query->have_posts() ) { |
| 638 | 375 | $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 | - | |
| 647 | 376 | // fetch and update settings |
| 648 | 377 | $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 | 378 | unset( $settings['height'], $settings['width'] ); |
| 379 | + $type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true ); | |
| 656 | 380 | $series = apply_filters( Visualizer_Plugin::FILTER_GET_CHART_SERIES, get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true ), $chart->ID, $type ); |
| 657 | 381 | $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 | 382 | // add chart to the array |
| 669 | - $charts[ $id ] = array( | |
| 383 | + $charts[ 'visualizer-' . $chart->ID ] = array( | |
| 670 | 384 | 'id' => $chart->ID, |
| 671 | 385 | 'type' => $type, |
| 672 | 386 | 'series' => $series, |
| 673 | 387 | 'settings' => $settings, |
| 674 | 388 | 'data' => $data, |
| 675 | - 'library' => $library, | |
| 676 | 389 | ); |
| 677 | 390 | } |
| 678 | 391 | // enqueue charts array |
| 679 | 392 | $ajaxurl = admin_url( 'admin-ajax.php' ); |
| 680 | 393 | wp_localize_script( |
| 681 | - 'visualizer-library', | |
| 682 | - 'visualizer', | |
| 683 | - array( | |
| 684 | - 'language' => $this->get_language(), | |
| 685 | - 'map_api_key' => get_option( 'visualizer-map-api-key' ), | |
| 394 | + 'visualizer-library', 'visualizer', array( | |
| 686 | 395 | 'charts' => $charts, |
| 687 | 396 | 'urls' => array( |
| 688 | 397 | 'base' => add_query_arg( 'vpage', false ), |
| 689 | 398 | 'create' => add_query_arg( |
| @@ -689,21 +398,17 @@ | ||
| 689 | 398 | 'create' => add_query_arg( |
| 690 | 399 | array( |
| 691 | 400 | 'action' => Visualizer_Plugin::ACTION_CREATE_CHART, |
| 692 | 401 | 'library' => 'yes', |
| 693 | - 'type' => isset( $_GET['type'] ) ? $_GET['type'] : '', | |
| 694 | - ), | |
| 695 | - $ajaxurl | |
| 402 | + ), $ajaxurl | |
| 696 | 403 | ), |
| 697 | 404 | 'edit' => add_query_arg( |
| 698 | 405 | array( |
| 699 | 406 | 'action' => Visualizer_Plugin::ACTION_EDIT_CHART, |
| 700 | 407 | 'library' => 'yes', |
| 701 | - ), | |
| 702 | - $ajaxurl | |
| 408 | + ), $ajaxurl | |
| 703 | 409 | ), |
| 704 | 410 | ), |
| 705 | - 'page_type' => 'library', | |
| 706 | 411 | ) |
| 707 | 412 | ); |
| 708 | 413 | // render library page |
| 709 | 414 | $render = new Visualizer_Render_Library(); |
| @@ -708,10 +413,9 @@ | ||
| 708 | 413 | // render library page |
| 709 | 414 | $render = new Visualizer_Render_Library(); |
| 710 | 415 | $render->charts = $charts; |
| 711 | 416 | $render->type = $filter; |
| 712 | - $render->types = self::_getChartTypesLocalized( false, false, false, true ); | |
| 713 | - $render->custom_css = $css; | |
| 417 | + $render->types = self::_getChartTypesLocalized(); | |
| 714 | 418 | $render->pagination = paginate_links( |
| 715 | 419 | array( |
| 716 | 420 | 'base' => add_query_arg( 'vpage', '%#%' ), |
| 717 | 421 | 'format' => '', |
