Commit 8088b6e5 authored by Kevin Stover's avatar Kevin Stover

Merge branch 'release/v2.9.6'

parents 056c1a1d 519522c3
......@@ -4,7 +4,7 @@
Tags: form, forms, contact form, custom form, form builder, form creator, form manager, form creation, contact forms, custom forms, forms builder, forms creator, forms manager, forms creation, form administration,
Requires at least: 3.8
Tested up to: 4.1.1
Stable tag: 2.9.5
Stable tag: 2.9.6
License: GPLv2 or later
Forms created with a simple drag and drop interface. Contact forms, Email collection forms, or any other form you want on your WordPress site.
......
......@@ -77,7 +77,7 @@ var nfField = Backbone.Model.extend( {
// Re-run makeSortable for new HTML
nfFields.listOptionsSortable();
jQuery( '.nf-field-settings' ).disableSelection();
jQuery( '.nf-field-settings .title' ).disableSelection();
} );
},
updateData: function() {
......@@ -326,7 +326,9 @@ var nfFields = new nfFields();
// Instantiate our form settings.
var nfForm = new nfForm();
jQuery( document ).ready( function( $ ) {
(function($){
$( document ).ready( function( $ ) {
nfFields.setup();
nfForm.setup();
......@@ -477,4 +479,6 @@ jQuery( document ).ready( function( $ ) {
$( this ).find( '.nf-edit-field' ).click();
} );
});
\ No newline at end of file
});
})(jQuery);
\ No newline at end of file
This diff is collapsed.
......@@ -3,14 +3,11 @@
add_action( 'init', 'ninja_forms_preview_form' );
function ninja_forms_preview_form() {
global $ninja_forms_append_page_form_id;
if( isset( $_REQUEST['form_id'] ) AND isset($_REQUEST['preview']) ) { //I
if( ! empty ( $_REQUEST['form_id'] ) AND ! empty ( $_REQUEST['preview'] ) ) { //I
$form_id = absint( $_REQUEST['form_id'] );
} else {
$form_id = '';
$ninja_forms_append_page_form_id = array($form_id);
add_filter( 'the_content', 'ninja_forms_append_to_page', 9999 );
}
$ninja_forms_append_page_form_id = array($form_id);
add_filter( 'the_content', 'ninja_forms_append_to_page', 9999 );
}
function ninja_forms_preview_link( $form_id = '', $echo = true ) {
......
......@@ -3,7 +3,7 @@
Plugin Name: Ninja Forms
Plugin URI: http://ninjaforms.com/
Description: Ninja Forms is a webform builder with unparalleled ease of use and features.
Version: 2.9.5
Version: 2.9.6
Author: The WP Ninjas
Author URI: http://ninjaforms.com
Text Domain: ninja-forms
......@@ -284,7 +284,7 @@ class Ninja_Forms {
// Plugin version
if ( ! defined( 'NF_PLUGIN_VERSION' ) )
define( 'NF_PLUGIN_VERSION', '2.9.5' );
define( 'NF_PLUGIN_VERSION', '2.9.6' );
// Plugin Folder Path
if ( ! defined( 'NF_PLUGIN_DIR' ) )
......
......@@ -3,7 +3,7 @@ Contributors: wpninjasllc, kstover, jameslaws, wpnzach, daveshine, mordauk, bftr
Tags: form, forms, contact form, custom form, form builder, form creator, form manager, form creation, contact forms, custom forms, forms builder, forms creator, forms manager, forms creation, form administration,
Requires at least: 3.8
Tested up to: 4.1.1
Stable tag: 2.9.5
Stable tag: 2.9.6
License: GPLv2 or later
Forms created with a simple drag and drop interface. Contact forms, Email collection forms, or any other form you want on your WordPress site.
......@@ -74,7 +74,7 @@ For help and video tutorials, please visit our website: [Ninja Forms Documentati
== Upgrade Notice ==
= 2.9.5 (3 March 2015) =
= 2.9.6 (6 March 2015) =
*Changes:*
......@@ -104,6 +104,19 @@ If you have any feature requests, please feel free to visit [ninjaforms.com](htt
== Changelog ==
= 2.9.6 (6 March 2015) =
*Bugs:*
* Fixed a bug that could prevent field settings dropdowns from being clicked on in FireFox.
* Fixed a bug that could prevent the preview page from showing properly.
= 2.9.5 (4 March 2015) =
*Bugs:*
* Deleting Ninja Forms from the plugins page should now work in all instances.
= 2.9.4 (4 March 2015) =
*Changes:*
......
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