Skip to content
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

Feature: Number input field #188

Merged
merged 2 commits into from
Jul 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .fontello
Original file line number Diff line number Diff line change
@@ -1 +1 @@
015abe7093f727ea50014d30fb984001
b27e9f4df1193078015631ab448fad05
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Changelog

- v1.11.0 - Feature: Number input [#188](https://github.com/kevinchappell/formBuilder/pull/188)
- v1.10.6 - Bugfix: Limit scope of bootstrap helpers [#187](https://github.com/kevinchappell/formBuilder/pull/187)
- v1.10.5 - Bugfix: Other option for radio and checkbox xml attribute [#186](https://github.com/kevinchappell/formBuilder/pull/186)
- v1.10.4 - Bugfix: Object.assign [#181](https://github.com/kevinchappell/formBuilder/pull/181)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
formBuilder v1.10.6
formBuilder v1.11.0
===========

[![Join the chat at https://gitter.im/kevinchappell/formBuilder](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/kevinchappell/formBuilder?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "formBuilder",
"version": "1.10.6",
"version": "1.11.0",
"main": [
"dist/*"
],
Expand Down
287 changes: 156 additions & 131 deletions demo/assets/css/form-builder.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions demo/assets/css/form-builder.min.css

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions demo/assets/css/form-render.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
formBuilder - http://kevinchappell.github.io/formBuilder/
Version: 1.10.6
Version: 1.11.0
Author: Kevin Chappell <[email protected]>
*/
[id^='frmb-'][id$='-form-wrap'] * {
Expand Down Expand Up @@ -353,6 +353,9 @@ Author: Kevin Chappell <[email protected]>
.form-group .required {
color: #C10000; }

.form-control.number {
width: auto; }

/* ------------ TOOLTIP ------------ */
*[tooltip] {
position: relative; }
Expand All @@ -378,7 +381,7 @@ Author: Kevin Chappell <[email protected]>
border-color: #222 transparent;
border-width: 6px 6px 0 6px;
bottom: 17px;
content: "";
content: '';
left: 2px;
position: absolute;
z-index: 99; }
Expand All @@ -395,7 +398,7 @@ Author: Kevin Chappell <[email protected]>
margin: 0 5px;
font-size: 12px; }

.form-control[type="color"] {
.form-control[type='color'] {
width: 60px;
padding: 2px;
display: inline-block; }
Expand Down
4 changes: 2 additions & 2 deletions demo/assets/css/form-render.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo/assets/css/site.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 47 additions & 8 deletions demo/assets/js/form-builder.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
formBuilder - http://kevinchappell.github.io/formBuilder/
Version: 1.10.6
Version: 1.11.0
Author: Kevin Chappell <[email protected]>
*/
'use strict';
Expand Down Expand Up @@ -548,6 +548,12 @@ function formBuilderHelpersFn(opts, formBuilder) {
previewData.style = style;
}

if (fieldType === 'number') {
previewData.min = $('input.fld-min', field).val();
previewData.max = $('input.fld-max', field).val();
previewData.step = $('input.fld-step', field).val();
}

if (fieldType === 'checkbox') {
previewData.toggle = $('.checkbox-toggle', field).is(':checked');
}
Expand Down Expand Up @@ -664,6 +670,7 @@ function formBuilderHelpersFn(opts, formBuilder) {
case 'email':
case 'date':
case 'file':
case 'number':
preview = '<input ' + attrsString + '>';
break;
case 'color':
Expand Down Expand Up @@ -1197,13 +1204,13 @@ function formBuilderEventsFn() {

var defaults = {
controlPosition: 'right',
controlOrder: ['autocomplete', 'button', 'checkbox', 'checkbox-group', 'date', 'file', 'header', 'hidden', 'paragraph', 'radio-group', 'select', 'text', 'textarea'],
controlOrder: ['autocomplete', 'button', 'checkbox', 'checkbox-group', 'date', 'file', 'header', 'hidden', 'paragraph', 'number', 'radio-group', 'select', 'text', 'textarea'],
dataType: 'xml',
/**
* Field types to be disabled
* ['text','select','textarea','radio-group','hidden','file','date','checkbox-group','checkbox','button','autocomplete']
*/
disableFields: ['autocomplete', 'hidden'],
disableFields: ['autocomplete', 'hidden', 'number'],
// Uneditable fields or other content you would like to appear before and after regular fields:
append: false,
prepend: false,
Expand Down Expand Up @@ -1269,6 +1276,7 @@ function formBuilderEventsFn() {
minOptionMessage: 'This field requires a minimum of 2 options',
name: 'Name',
no: 'No',
number: 'Number',
off: 'Off',
on: 'On',
option: 'Option',
Expand Down Expand Up @@ -1406,6 +1414,13 @@ function formBuilderEventsFn() {
type: 'paragraph',
className: 'paragraph'
}
}, {
label: opts.messages.number,
attrs: {
type: 'number',
className: 'number',
name: 'number'
}
}, {
label: opts.messages.hidden,
attrs: {
Expand Down Expand Up @@ -1473,7 +1488,6 @@ function formBuilderEventsFn() {
}

// Create draggable fields for formBuilder

var cbUl = _helpers.markup('ul', null, { id: boxID, className: 'frmb-control' });

if (opts.sortableControls) {
Expand Down Expand Up @@ -1846,7 +1860,15 @@ function formBuilderEventsFn() {

advFields.push(subTypeField(values));

advFields.push(btnStyles(values.style, values.type));
if (values.type === 'button') {
advFields.push(btnStyles(values.style, values.type));
}

if (values.type === 'number') {
advFields.push(numberAttribute('min', values));
advFields.push(numberAttribute('max', values));
advFields.push(numberAttribute('step', values));
}

// Placeholder
advFields.push(textAttribute('placeholder', values));
Expand Down Expand Up @@ -1968,6 +1990,20 @@ function formBuilderEventsFn() {
return styleField;
};

/**
* Add a number attibute to a field.
* @param {String} attribute
* @param {Object} values
* @return {String}
*/
var numberAttribute = function numberAttribute(attribute, values) {
var attrVal = values[attribute] || '';
var attrLabel = opts.messages[attribute] || attribute,
placeholder = opts.messages.placeholders[attribute] || '',
numberAttribute = '<input type="number" value="' + attrVal + '" name="' + attribute + '" placeholder="' + placeholder + '" class="fld-' + attribute + ' form-control" id="' + attribute + '-' + lastID + '">';
return '<div class="form-group ' + attribute + '-wrap"><label for="' + attribute + '-' + lastID + '">' + attrLabel + '</label> ' + numberAttribute + '</div>';
};

/**
* Generate some text inputs for field attributes, **will be replaced**
* @param {String} attribute
Expand All @@ -1980,7 +2016,7 @@ function formBuilderEventsFn() {

var textArea = ['paragraph'];

var noMaxlength = ['checkbox', 'select', 'checkbox-group', 'date', 'autocomplete', 'radio-group', 'hidden', 'button', 'header'];
var noMaxlength = ['checkbox', 'select', 'checkbox-group', 'date', 'autocomplete', 'radio-group', 'hidden', 'button', 'header', 'number'];

var attrVal = attribute === 'label' ? values.label : values[attribute] || '';
var attrLabel = opts.messages[attribute];
Expand Down Expand Up @@ -2041,7 +2077,7 @@ function formBuilderEventsFn() {
return elem === true;
})) {

requireField += '<div class="form-group">';
requireField += '<div class="form-group required-wrap">';
requireField += '<label>&nbsp;</label>';
var _requiredField = _helpers.markup('input', null, {
className: 'required',
Expand Down Expand Up @@ -2487,7 +2523,10 @@ function formBuilderEventsFn() {
required: $('input.required', $field).is(':checked'),
toggle: $('.checkbox-toggle', $field).is(':checked'),
type: types.type,
subtype: types.subtype
subtype: types.subtype,
min: $('input.fld-min', $field).val(),
max: $('input.fld-max', $field).val(),
step: $('input.fld-step', $field).val()
};
if (roleVals.length) {
xmlAttrs.role = roleVals.join(',');
Expand Down
6 changes: 3 additions & 3 deletions demo/assets/js/form-builder.min.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion demo/assets/js/form-render.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
formBuilder - http://kevinchappell.github.io/formBuilder/
Version: 1.10.6
Version: 1.11.0
Author: Kevin Chappell <[email protected]>
*/
'use strict';
Expand Down Expand Up @@ -266,6 +266,7 @@ function FormRenderFn(options, element) {
case 'text':
case 'password':
case 'email':
case 'number':
case 'file':
case 'hidden':
case 'date':
Expand Down
Loading