diff --git a/README.md b/README.md index 72556b6..af59f48 100644 --- a/README.md +++ b/README.md @@ -1,22 +1 @@ -# Avada Custom Visual Builder Button - -

Adds a custom Avada button shortcode to the classic editor with simple parameters.

- - - - - - - - - - - - -
ParametersDescription
linkurl (required)
textlabel (required)
targetleave blank / newtab / lightbox
icontrue / false
icon_classfont awesome class (optional)
icon_positionleft / right
- -

Basics:

- +# Avada-Custom-Visual-Builder-Button \ No newline at end of file diff --git a/custom-visual-builder-button.php b/custom-visual-builder-button.php index 3ab14c8..a662908 100644 --- a/custom-visual-builder-button.php +++ b/custom-visual-builder-button.php @@ -1,29 +1,21 @@ set_username( '4suredev' ); // set username -$updater->set_repository( 'Avada-Custom-Visual-Builder-Button' ); // set repo -$updater->initialize(); // initialize the updater -if( ! class_exists( 'Custom_visual_builder_button_updater' ) ){ - include_once( plugin_dir_path( __FILE__ ) . 'updater.php' ); -} +define('VBB_PLUGIN_PATH', home_url().'/wp-content/plugins/custom-visual-builder-button/'); add_action( 'wp_enqueue_scripts', 'vbb_enqueue_styles' ); function vbb_enqueue_styles(){ wp_enqueue_style( 'vbb-widget-styles', VBB_PLUGIN_PATH.'css/frontend-button-widget-styles.css' ); } -add_shortcode('button', 'vbb_custom_visual_builder_button'); -function vbb_custom_visual_builder_button($atts = array()){ +add_shortcode('button', 'custom_visual_builder_button'); +function custom_visual_builder_button($atts = array()){ $args = shortcode_atts( array( 'target' => '', @@ -52,7 +44,7 @@ function vbb_custom_visual_builder_button($atts = array()){ return $html; } //add media button to visual builder -function vbb_add_shortcodes_media_button() { +function add_shortcodes_media_button() { $the_page = get_current_screen(); $current_page = $the_page->post_type; $allowed = array( @@ -61,11 +53,10 @@ function vbb_add_shortcodes_media_button() { 'product', 'tribe_events' ); - if (in_array($current_page, $allowed, false) || $the_page->base == 'toplevel_page_access-manager' || $the_page->base == 'post' || $the_page->base == 'toplevel_page_acc-default-settings'){ + if (in_array($current_page, $allowed, false) || $the_page->base == 'toplevel_page_access-manager' || $the_page->base == 'post'){ printf( '' . ' %s' . '', '#', __( 'Generate Button', 'textdomain' ) ); } - $current_screen = get_current_screen()->base; - if ($current_screen == 'toplevel_page_access-manager' || $current_screen == 'toplevel_page_acc-default-settings'){ + if(get_current_screen()->base == 'toplevel_page_access-manager'){ echo ''; } } -add_action( 'media_buttons', 'vbb_add_shortcodes_media_button'); +add_action( 'media_buttons', 'add_shortcodes_media_button'); //Button shortcode admin bar widget -add_action('admin_enqueue_scripts', 'vbb_admin_scripts_enqueue'); -function vbb_admin_scripts_enqueue($hook) { +add_action('admin_enqueue_scripts', 'my_enqueue'); +function my_enqueue($hook) { // Only add to the edit post/page admin page. - if ('post.php' == $hook || 'post-new.php' == $hook || 'toplevel_page_access-manager' == $hook || 'toplevel_page_acc-default-settings' == $hook) { - wp_enqueue_script('admin_custom_script', VBB_PLUGIN_PATH.'js/custom-admin-scripts.js', array('jquery-ui-dialog')); + if ('post.php' == $hook || 'post-new.php' == $hook || 'toplevel_page_access-manager' == $hook) { + wp_enqueue_script('admin_custom_script', VBB_PLUGIN_PATH.'js/custom-admin-scripts.js'); wp_enqueue_script('jquery-ui', 'https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.2/jquery-ui.min.js'); }else{return;} } -add_action( 'edit_form_after_editor', 'vbb_render_button_shortcode_dialog' ); -add_action( 'toplevel_page_access-manager', 'vbb_render_button_shortcode_dialog', 20 ); -add_action( 'toplevel_page_acc-default-settings', 'vbb_render_button_shortcode_dialog', 20 ); -function vbb_render_button_shortcode_dialog( $post ){ +add_action( 'edit_form_after_editor', 'render_button_shortcode_dialog' ); +add_action( 'toplevel_page_access-manager', 'render_button_shortcode_dialog', 20 ); +function render_button_shortcode_dialog( $post ){ echo ' '; } \ No newline at end of file diff --git a/js/custom-admin-scripts.js b/js/custom-admin-scripts.js index 8a7a05b..75c6c3c 100644 --- a/js/custom-admin-scripts.js +++ b/js/custom-admin-scripts.js @@ -14,22 +14,13 @@ jQuery(document).ready(function($){ }, minWidth: 480 }); - if(typeof acf != 'undefined'){ - acf.addAction('load', function(){ - $(document).on("click", ".generate-button-shortcode", function(e){ - e.preventDefault(); - $("#button-shortcode-dialog").dialog("open"); - $("#page-mask").css({"opacity":1, "pointer-events": "auto"}); - }); - }); - }else{ + acf.addAction('load', function(){ $(document).on("click", ".generate-button-shortcode", function(e){ e.preventDefault(); $("#button-shortcode-dialog").dialog("open"); $("#page-mask").css({"opacity":1, "pointer-events": "auto"}); }); - } - + }); $('.generate-button-shortcode').click(function(e){ e.preventDefault(); $("#button-shortcode-dialog").dialog("open"); diff --git a/updater.php b/updater.php index 29622b8..7545277 100644 --- a/updater.php +++ b/updater.php @@ -4,11 +4,7 @@ class Custom_visual_builder_button_updater { protected $plugin; protected $basename; protected $active; - private $username; - private $repository; - private $authorize_token; - private $github_response; - + public function __construct( $file ) { $this->file = $file; add_action( 'admin_init', array( $this, 'set_plugin_properties' ) ); @@ -20,123 +16,4 @@ class Custom_visual_builder_button_updater { $this->basename = plugin_basename( $this->file ); $this->active = is_plugin_active( $this->basename ); } - public function set_username( $username ) { - $this->username = $username; - } - public function set_repository( $repository ) { - $this->repository = $repository; - } - public function authorize( $token ) { - $this->authorize_token = $token; - } - private function get_repository_info() { - if ( is_null( $this->github_response ) ) { // Do we have a response? - $request_uri = sprintf( 'https://api.github.com/repos/%s/%s/releases', $this->username, $this->repository ); // Build URI - if( $this->authorize_token ) { // Is there an access token? - $request_uri = add_query_arg( 'access_token', $this->authorize_to , $request_uri ); // Append it - } - $response = json_decode( wp_remote_retrieve_body( wp_remote_get( $request_uri ) ), true ); // Get JSON and parse it - if( is_array( $response ) ) { // If it is an array - $response = current( $response ); // Get the first item - } - if( $this->authorize_token ) { // Is there an access token? - $response['zipball_url'] = add_query_arg( 'access_token', $this->authorize_token, $response['zipball_url'] ); // Update our zip url with token - } - $this->github_response = $response; // Set it to our property - } - } - public function initialize() { - /* Adding a filter to the transient. */ - add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'modify_transient' ), 10, 1 ); - add_filter( 'plugins_api', array( $this, 'plugin_popup' ), 10, 3); - add_filter( 'upgrader_post_install', array( $this, 'after_install' ), 10, 3 ); - // Add Authorization Token to download_package - add_filter( 'upgrader_pre_download', - function() { - add_filter( 'http_request_args', [ $this, 'download_package' ], 15, 2 ); - return false; // upgrader_pre_download filter default return value. - } - ); - } - public function modify_transient( $transient ) { - if( property_exists( $transient, 'checked') ) { // Check if transient has a checked property - if( $checked = $transient->checked ) { // Did WordPress check for updates? - $this->get_repository_info(); // Get the repo info - if( is_array($this->github_response) && !empty($this->github_response['tag_name']) && !empty($checked[$this->basename]) ) { // Check response - $out_of_date = version_compare( $this->github_response['tag_name'], $checked[$this->basename], 'gt' ); // Check if we're out of date - } else { - $out_of_date = false; - } - if( $out_of_date ) { - $new_files = $this->github_response['zipball_url']; // Get the ZIP - $slug = current( explode('/', $this->basename ) ); // Create valid slug - $plugin = array( // setup our plugin info - 'url' => $this->plugin["PluginURI"], - 'slug' => $slug, - 'package' => $new_files, - 'new_version' => $this->github_response['tag_name'] - ); - $transient->response[ $this->basename ] = (object) $plugin; // Return it in response - } - } - } - return $transient; // Return filtered transient - } - public function plugin_popup( $result, $action, $args ) { - if( ! empty( $args->slug ) ) { // If there is a slug - - if( $args->slug == current( explode( '/' , $this->basename ) ) ) { // And it's our slug - - $this->get_repository_info(); // Get our repo info - - // Set it to an array - $plugin = array( - 'name' => $this->plugin["Name"], - 'slug' => $this->basename, - 'version' => $this->github_response['tag_name'], - 'author' => $this->plugin["AuthorName"], - 'author_profile' => $this->plugin["AuthorURI"], - 'last_updated' => $this->github_response['published_at'], - 'homepage' => $this->plugin["PluginURI"], - 'short_description' => $this->plugin["Description"], - 'sections' => array( - 'Description' => $this->plugin["Description"], - 'Updates' => $this->github_response['body'], - ), - 'download_link' => $this->github_response['zipball_url'] - ); - - return (object) $plugin; // Return the data - } - - } - return $result; // Otherwise return default - } - - public function download_package( $args, $url ) { - - if ( null !== $args['filename'] ) { - if( $this->authorize_token ) { - $args = array_merge( $args, array( "headers" => array( "Authorization" => "token {$this->authorize_token}" ) ) ); - } - } - - remove_filter( 'http_request_args', [ $this, 'download_package' ] ); - - return $args; - } - - public function after_install( $response, $hook_extra, $result ) { - global $wp_filesystem; // Get global FS object - - $install_directory = plugin_dir_path( $this->file ); // Our plugin directory - $wp_filesystem->move( $result['destination'], $install_directory ); // Move files to the plugin dir - $result['destination'] = $install_directory; // Set the destination for the rest of the stack - - if ( $this->active ) { // If it was active - activate_plugin( $this->basename ); // Reactivate - } - - return $result; - } }