Commit 84ba4f80 authored by Kevin Stover's avatar Kevin Stover

Merge branch 'release/v2.9.4'

parents c64b0c64 cc23dec1
<?php
add_action('init', 'ninja_forms_register_edit_field_placeholder');
function ninja_forms_register_edit_field_placeholder(){
add_action('ninja_forms_edit_field_before_registered', 'ninja_forms_edit_field_placeholder', 10);
}
function ninja_forms_edit_field_placeholder($field_id){
global $ninja_forms_fields;
$field_row = ninja_forms_get_field_by_id($field_id);
$field_type = $field_row['type'];
$field_data = $field_row['data'];
$reg_field = $ninja_forms_fields[$field_type];
$edit_placeholder = $reg_field['edit_placeholder'];
if($edit_placeholder){
if(isset($field_data['placeholder'])){
$placeholder = stripslashes($field_data['placeholder']);
}else{
$placeholder = '';
}
ninja_forms_edit_field_el_output($field_id, 'text', __( 'Placeholder', 'ninja-forms' ), 'placeholder', $placeholder, 'wide', '', 'widefat ninja-forms-field-label');
}
}
\ No newline at end of file
......@@ -90,6 +90,7 @@ function ninja_forms_register_field_textbox(){
'pre_process' => 'ninja_forms_field_text_pre_process',
'edit_sub_value' => 'nf_field_text_edit_sub_value',
'sub_table_value' => 'nf_field_text_sub_table_value',
'edit_placeholder' => true,
);
ninja_forms_register_field( '_text', $args );
......
......@@ -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.3
Version: 2.9.4
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.3' );
define( 'NF_PLUGIN_VERSION', '2.9.4' );
// Plugin Folder Path
if ( ! defined( 'NF_PLUGIN_DIR' ) )
......@@ -484,6 +484,7 @@ class Ninja_Forms {
//Edit Field Functions
require_once( NINJA_FORMS_DIR . "/includes/admin/edit-field/edit-field.php" );
require_once( NINJA_FORMS_DIR . "/includes/admin/edit-field/label.php" );
require_once( NINJA_FORMS_DIR . "/includes/admin/edit-field/placeholder.php" );
require_once( NINJA_FORMS_DIR . "/includes/admin/edit-field/hr.php" );
require_once( NINJA_FORMS_DIR . "/includes/admin/edit-field/req.php" );
require_once( NINJA_FORMS_DIR . "/includes/admin/edit-field/custom-class.php" );
......
......@@ -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.3
Stable tag: 2.9.4
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,13 +74,14 @@ For help and video tutorials, please visit our website: [Ninja Forms Documentati
== Upgrade Notice ==
= 2.9.3 (3 March 2015) =
= 2.9.4 (3 March 2015) =
*Changes:*
* Simplified the form creation interface by adding a "Build Your Form" tab, an "Emails & Actions" tab, and a "Settings" tab. All other tabs have been removed.
* Form Preview and Submissions are now buttons that can be clicked at any stage of editing a form.
* Field settings have been simplified by introducing a series of new, expandable settings sections. These sections house more advanced or less-common settings.
* Added HTML5 placeholders to text fields.
*Bugs:*
......@@ -101,6 +102,12 @@ If you have any feature requests, please feel free to visit [ninjaforms.com](htt
== Changelog ==
= 2.9.4 (4 March 2015) =
*Changes:*
* Added placeholders for text fields.
= 2.9.3 (4 March 2015) =
*Bugs:*
......
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