| @@ -78,9 +78,8 @@ | ||
| 78 | 78 | $this->set_locale(); |
| 79 | 79 | $this->define_admin_hooks(); |
| 80 | 80 | $this->define_public_hooks(); |
| 81 | 81 | $this->define_integrations_hooks(); |
| 82 | - $this->define_custom_post_type_hooks(); | |
| 83 | 82 | |
| 84 | 83 | } |
| 85 | 84 | |
| 86 | 85 | /** |
| @@ -140,14 +139,8 @@ | ||
| 140 | 139 | * side of the site. |
| 141 | 140 | */ |
| 142 | 141 | require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-chart-builder-public.php'; |
| 143 | 142 | |
| 144 | - /** | |
| 145 | - * The class responsible for defining all functions for getting all custom post type functions | |
| 146 | - */ | |
| 147 | - require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-chart-builder-custom-post-type.php'; | |
| 148 | - | |
| 149 | - | |
| 150 | 143 | $this->loader = new Chart_Builder_Loader(); |
| 151 | 144 | |
| 152 | 145 | } |
| 153 | 146 | |
| @@ -214,10 +207,8 @@ | ||
| 214 | 207 | $this->loader->add_filter( 'ays_cb_chart_page_settings_contents_settings', $plugin_admin, 'settings_contents_animation_settings', 110, 2 ); |
| 215 | 208 | $this->loader->add_filter( 'ays_cb_chart_page_settings_contents_settings', $plugin_admin, 'settings_contents_live_chart_settings', 115, 2 ); |
| 216 | 209 | $this->loader->add_filter( 'ays_cb_chart_page_settings_contents_settings', $plugin_admin, 'settings_contents_export_options', 120, 2 ); |
| 217 | 210 | $this->loader->add_filter( 'ays_cb_chart_page_settings_contents_settings_chartjs', $plugin_admin, 'settings_contents_general_settings_chartjs', 50, 2 ); |
| 218 | - $this->loader->add_filter( 'ays_cb_chart_page_settings_contents_settings_chartjs', $plugin_admin, 'settings_contents_tooltip_settings_chartjs', 50, 2 ); | |
| 219 | - $this->loader->add_filter( 'ays_cb_chart_page_settings_contents_settings_chartjs', $plugin_admin, 'settings_contents_legend_settings_chartjs', 50, 2 ); | |
| 220 | 211 | |
| 221 | 212 | // Add Chart page styles contents |
| 222 | 213 | $this->loader->add_action( 'ays_cb_chart_page_styles_contents', $plugin_admin, 'ays_chart_page_styles_contents', 10, 3 ); |
| 223 | 214 | $this->loader->add_filter( 'ays_cb_chart_page_styles_contents_settings', $plugin_admin, 'settings_contents_chart_styles_settings', 50, 2 ); |
| @@ -234,9 +225,8 @@ | ||
| 234 | 225 | $this->loader->add_filter( 'ays_cb_chart_page_advanced_settings_contents_settings', $plugin_admin, 'settings_contents_slices_settings', 60, 2 ); |
| 235 | 226 | $this->loader->add_filter( 'ays_cb_chart_page_advanced_settings_contents_settings', $plugin_admin, 'settings_contents_series_settings', 70, 2 ); |
| 236 | 227 | $this->loader->add_filter( 'ays_cb_chart_page_advanced_settings_contents_settings', $plugin_admin, 'settings_contents_row_settings', 80, 2 ); |
| 237 | 228 | $this->loader->add_filter( 'ays_cb_chart_page_advanced_settings_contents_settings_chartjs', $plugin_admin, 'settings_contents_advanced_settings_chartjs', 50, 2 ); |
| 238 | - $this->loader->add_filter( 'ays_cb_chart_page_advanced_settings_contents_settings_chartjs', $plugin_admin, 'settings_contents_slices_settings_chartjs', 50, 2 ); | |
| 239 | 229 | |
| 240 | 230 | // Add Settings link to the plugin |
| 241 | 231 | $plugin_basename = plugin_basename( plugin_dir_path( __DIR__ ) . $this->plugin_name . '.php' ); |
| 242 | 232 | $this->loader->add_filter( 'plugin_action_links_' . $plugin_basename, $plugin_admin, 'add_action_links' ); |
| @@ -243,17 +233,17 @@ | ||
| 243 | 233 | |
| 244 | 234 | |
| 245 | 235 | // Admin AJAX action |
| 246 | 236 | $this->loader->add_action( 'wp_ajax_ays_chart_admin_ajax', $plugin_admin, 'ays_admin_ajax' ); |
| 247 | - // $this->loader->add_action( 'wp_ajax_nopriv_ays_chart_admin_ajax', $plugin_admin, 'ays_admin_ajax' ); | |
| 237 | + $this->loader->add_action( 'wp_ajax_nopriv_ays_chart_admin_ajax', $plugin_admin, 'ays_admin_ajax' ); | |
| 248 | 238 | $this->loader->add_action( 'wp_ajax_deactivate_plugin_option_cb', $plugin_admin, 'deactivate_plugin_option'); |
| 249 | 239 | $this->loader->add_action( 'wp_ajax_nopriv_deactivate_plugin_option_cb', $plugin_admin, 'deactivate_plugin_option'); |
| 250 | 240 | |
| 251 | 241 | $this->loader->add_action( 'wp_ajax_ays_chart_install_plugin', $plugin_admin, 'ays_chart_install_plugin' ); |
| 252 | - // $this->loader->add_action( 'wp_ajax_nopriv_ays_chart_install_plugin', $plugin_admin, 'ays_chart_install_plugin' ); | |
| 242 | + $this->loader->add_action( 'wp_ajax_nopriv_ays_chart_install_plugin', $plugin_admin, 'ays_chart_install_plugin' ); | |
| 253 | 243 | |
| 254 | 244 | $this->loader->add_action( 'wp_ajax_ays_chart_activate_plugin', $plugin_admin, 'ays_chart_activate_plugin' ); |
| 255 | - // $this->loader->add_action( 'wp_ajax_nopriv_ays_chart_activate_plugin', $plugin_admin, 'ays_chart_activate_plugin' ); | |
| 245 | + $this->loader->add_action( 'wp_ajax_nopriv_ays_chart_activate_plugin', $plugin_admin, 'ays_chart_activate_plugin' ); | |
| 256 | 246 | |
| 257 | 247 | $this->loader->add_action( 'elementor/widgets/widgets_registered', $plugin_admin, 'chart_builder_el_widgets_registered' ); |
| 258 | 248 | |
| 259 | 249 | $this->loader->add_action( 'in_admin_footer', $plugin_admin, 'chart_builder_admin_footer', 1 ); |
| @@ -261,11 +251,8 @@ | ||
| 261 | 251 | // Sale Banner |
| 262 | 252 | $this->loader->add_action( 'admin_notices', $plugin_admin, 'ays_chart_sale_banner', 1 ); |
| 263 | 253 | $this->loader->add_action( 'wp_ajax_ays_chart_dismiss_button', $plugin_admin, 'ays_chart_dismiss_button' ); |
| 264 | 254 | $this->loader->add_action( 'wp_ajax_nopriv_ays_chart_dismiss_button', $plugin_admin, 'ays_chart_dismiss_button' ); |
| 265 | - | |
| 266 | - $this->loader->add_action('current_screen', $plugin_admin, 'ays_chart_disable_all_notice_from_plugin', 200, 1); | |
| 267 | - $this->loader->add_filter( 'admin_body_class', $plugin_admin, 'ays_chart_add_body_class' ); | |
| 268 | 255 | } |
| 269 | 256 | |
| 270 | 257 | /** |
| 271 | 258 | * Register all of the hooks related to the public-facing functionality |
| @@ -276,9 +263,9 @@ | ||
| 276 | 263 | */ |
| 277 | 264 | private function define_public_hooks() { |
| 278 | 265 | |
| 279 | 266 | $plugin_public = new Chart_Builder_Public( $this->get_plugin_name(), $this->get_version() ); |
| 280 | - $this->loader->add_action( 'wp_head', $plugin_public, 'add_custom_chart_styles' ); | |
| 267 | + | |
| 281 | 268 | // $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' ); |
| 282 | 269 | // $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' ); |
| 283 | 270 | |
| 284 | 271 | } |
| @@ -312,17 +299,8 @@ | ||
| 312 | 299 | // ===== Database integration ===== |
| 313 | 300 | $this->loader->add_filter( 'ays_cb_settings_page_integrations_contents', $plugin_integrations, 'ays_settings_page_database_content', 50, 3 ); |
| 314 | 301 | |
| 315 | 302 | // ===== Database integration ===== |
| 316 | - } | |
| 317 | - | |
| 318 | - /** | |
| 319 | - * Run the loader to execute all of the hooks with WordPress. | |
| 320 | - * | |
| 321 | - * @since 1.0.0 | |
| 322 | - */ | |
| 323 | - private function define_custom_post_type_hooks(){ | |
| 324 | - $plugin_custom_post_type = new Chart_Builder_Custom_Post_Type( $this->get_plugin_name(), $this->get_version() ); | |
| 325 | 303 | } |
| 326 | 304 | |
| 327 | 305 | |
| 328 | 306 | /** |
