Commit e0287c5f authored by Kevin Stover's avatar Kevin Stover

Merge branch 'master' of github.com:wpninjas/ninja-forms

parents 70d52f9d f2f6d770
......@@ -25,6 +25,7 @@ define( [], function() {
this.listenTo( nfRadio.channel( 'app' ), 'change:currentDomain', this.autoOpenDrawer );
this.listenTo( nfRadio.channel( 'drawer' ), 'opened', this.filterDrawerContents );
this.listenTo( nfRadio.channel( 'drawer' ), 'closed', this.SwitchToFieldsDomain );
},
trackKeyChanges: function( settingModel ) {
......@@ -96,8 +97,16 @@ define( [], function() {
dataModel.set( name, '' );
var fieldDomainModel = nfRadio.channel( 'app' ).request( 'get:domainModel', 'fields' );
nfRadio.channel( 'app' ).request( 'change:currentDomain', null, fieldDomainModel );
this.switchDomain = true;
nfRadio.channel( 'app' ).request( 'close:drawer' );
},
SwitchToFieldsDomain: function() {
if( this.switchDomain ) {
var fieldDomainModel = nfRadio.channel( 'app' ).request( 'get:domainModel', 'fields' );
nfRadio.channel('app').request('change:currentDomain', null, fieldDomainModel);
this.switchDomain = null;
}
},
autoOpenDrawer: function() {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
jQuery(document).ready(function(jQuery) {
init_all_the_ninja_things();
document.addEventListener("pjax:success", function() {
init_all_the_ninja_things();
});
});
var init_all_the_ninja_things = function() {
// Prevent the enter key from submitting the form.
jQuery(".ninja-forms-form input").bind("keypress", function(e) {
if (e.keyCode == 13) {
......@@ -714,7 +725,7 @@ jQuery(document).ready(function(jQuery) {
}
}
});
}); //End document.ready
}
function ninja_forms_before_submit( formData, jqForm, options ){
var form_id = jQuery( jqForm ).prop( 'id' ).replace( 'ninja_forms_form_', '' );
......
......@@ -10,6 +10,12 @@ final class NF_AddonChecker
public function check_plugins()
{
if ( ! function_exists( 'get_plugins' ) ) {
require_once ABSPATH . 'wp-admin/includes/plugin.php';
}
$plugins = get_plugins();
foreach( $plugins as $plugin => $data ){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment