Commit 38477db9 authored by KR Moorhouse's avatar KR Moorhouse

Resolved merge conflicts.

parents 05479e46 d483b05d
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
......@@ -19,6 +19,7 @@ define([], function() {
format: dateFormat,
outputFormat: dateFormat,
classes: jQuery( el ).attr( "class" ),
placeholder: view.model.get( 'placeholder' ),
pikadayOptions: {
yearRange: this.getYearRange( view.model ),
minDate: this.getMinDate( view.model ),
......
......@@ -93,6 +93,9 @@ define([], function() {
if( 'listmultiselect' == this.type ){
otherAttributes = otherAttributes + ' multiple';
var multiSize = this.multi_size || 5;
otherAttributes = otherAttributes + ' size="' + multiSize + '"';
}
return otherAttributes;
......@@ -133,4 +136,4 @@ define([], function() {
});
return controller;
} );
\ No newline at end of file
} );
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -611,6 +611,22 @@ return apply_filters( 'ninja_forms_field_settings', array(
'help' => __( 'This column in the submissions table will sort by number.', 'ninja-forms' ),
),
/*
|--------------------------------------------------------------------------
| Display Settings
|--------------------------------------------------------------------------
*/
// Multi-Select List Only
'multi_size' => array(
'name' => 'multi_size',
'type' => 'number',
'label' => __( 'Multi-Select Box Size', 'ninja-forms'),
'width' => 'one-half',
'group' => 'primary',
'value' => 5,
),
/*
|--------------------------------------------------------------------------
| Un-Grouped Settings
......
......@@ -21,7 +21,7 @@ class NF_Fields_Date extends NF_Fields_Textbox
protected $_settings = array( 'date_default', 'date_format', 'year_range' );
protected $_settings_exclude = array( 'default', 'placeholder', 'input_limit_set', 'disable_input' );
protected $_settings_exclude = array( 'default', 'input_limit_set', 'disable_input' );
public function __construct()
{
......
......@@ -17,6 +17,8 @@ class NF_Fields_ListMultiselect extends NF_Abstracts_List
protected $_old_classname = 'list-multiselect';
protected $_settings = array( 'multi_size' );
public function __construct()
{
parent::__construct();
......@@ -51,4 +53,4 @@ class NF_Fields_ListMultiselect extends NF_Abstracts_List
}
return $value;
}
}
\ No newline at end of file
}
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