-
Notifications
You must be signed in to change notification settings - Fork 61
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make compatible to embed into theme #7
Open
theKhorshed
wants to merge
4
commits into
jcchavezs:master
Choose a base branch
from
theKhorshed:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
4441ce6
Use wp_enqueue_scripts hook instead of admin_footer to enqueue script
theKhorshed 709be64
Make the JS enqueue url compatible with both theme and plugin
theKhorshed 2550f04
fix js enqueue problem
theKhorshed fd86fbc
Use CMB2 Utility function
theKhorshed File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,21 +21,20 @@ function cmb2_conditionals_load_actions() | |
define('CMB2_CONDITIONALS_PRIORITY', 99999); | ||
|
||
add_action('admin_init', 'cmb2_conditionals_hook_data_to_save_filtering', CMB2_CONDITIONALS_PRIORITY); | ||
add_action('admin_footer', 'cmb2_conditionals_footer', CMB2_CONDITIONALS_PRIORITY); | ||
} | ||
|
||
add_action('admin_enqueue_scripts', 'cmb2_conditionals_footer', CMB2_CONDITIONALS_PRIORITY); | ||
/** | ||
* Decides whether include the scripts or not. | ||
*/ | ||
function cmb2_conditionals_footer() | ||
function cmb2_conditionals_footer($hook) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice improvement. I was not aware of this. |
||
{ | ||
global $pagenow; | ||
if( $hook != 'post.php' && $hook != 'post-new.php' ){ | ||
return; | ||
} | ||
|
||
if(!in_array($pagenow, array('post-new.php', 'post.php'))) { | ||
return; | ||
} | ||
|
||
wp_enqueue_script('cmb2-conditionals', plugins_url('/cmb2-conditionals.js', __FILE__ ), array('jquery'), '1.0.2', true); | ||
$url = CMB2_Utils::get_url_from_dir( trailingslashit( dirname( __FILE__ ) ) ) | ||
wp_enqueue_script('cmb2-conditionals', $url . 'cmb2-conditionals.js', array('jquery'), '1.0.2', true); | ||
} | ||
|
||
/** | ||
|
@@ -86,4 +85,4 @@ function cmb2_conditional_filter_data_to_save(CMB2 $cmb2, $object_id) | |
continue; | ||
} | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I like the hook change but I do not understand why to move this out of the function. Can you @theKhorshed please explain it to me?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi, It was actually not working inside the function. Probably because the function is called by the 'plugins_loaded' hook.