Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add new option 'showCommandButtons' #244

Merged
merged 3 commits into from
Sep 12, 2016
Merged

Add new option 'showCommandButtons' #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0154428
Add 'showCommandButtons' option.
srachner Sep 12, 2016
113b543
Add helper for the showXML data dialog and export it as an action.
srachner Sep 12, 2016
5fa0b72
Rename newly added option and helper method.
srachner Sep 12, 2016
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jQuery(document).ready(function($) {
| [notify](http://formbuilder.readthedocs.io/en/latest/formBuilder/options/notify/) | {Object} | `{error: message => alert(message)}` | [See form-builder.js#L186](https://github.com/kevinchappell/formBuilder/blob/master/src/js/form-builder.js#L186) |
| [sortableControls](http://formbuilder.readthedocs.io/en/latest/formBuilder/options/sortableControls/) | {Bool} | `sortableControls: true` | `false` |
| [stickyControls](http://formbuilder.readthedocs.io/en/latest/formBuilder/options/stickyControls/) | {Bool} | `stickyControls: true` | `false` |

| [showActionButtons](http://formbuilder.readthedocs.io/en/latest/formBuilder/options/showActionButtons/) | {Bool} | `showActionButtons: false` | `true` |
## [Changelog](https://github.com/kevinchappell/formBuilder/blob/master/CHANGELOG.md) ##

## Translators Needed!
Expand Down
10 changes: 3 additions & 7 deletions demo/assets/js/form-builder.min.js
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 2 additions & 6 deletions demo/assets/js/form-render.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo/assets/js/form-render.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

120 changes: 66 additions & 54 deletions dist/form-builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1287,6 +1287,15 @@ function formBuilderHelpersFn(opts, formBuilder) {
});
};

_helpers.showData = function () {

var data = utils.escapeHtml(formBuilder.formData),
code = utils.markup('code', data, { className: 'formData-' + opts.dataType }),
pre = utils.markup('pre', code);

_helpers.dialog(pre, null, 'data-dialog');
};

return _helpers;
}
'use strict';
Expand Down Expand Up @@ -1510,6 +1519,7 @@ function formBuilderEventsFn() {
},
sortableControls: false,
stickyControls: false,
showActionButtons: true,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perfect

prefix: 'form-builder-'
};

Expand Down Expand Up @@ -1674,25 +1684,27 @@ function formBuilderEventsFn() {

var viewDataText = opts.dataType === 'xml' ? opts.messages.viewXML : opts.messages.viewJSON;

// Build our headers and action links
var viewData = utils.markup('button', viewDataText, {
id: frmbID + '-view-data',
type: 'button',
className: 'view-data btn btn-default'
}),
clearAll = utils.markup('button', opts.messages.clearAll, {
id: frmbID + '-clear-all',
type: 'button',
className: 'clear-all btn btn-default'
}),
saveAll = utils.markup('button', opts.messages.save, {
className: 'btn btn-primary ' + opts.prefix + 'save',
id: frmbID + '-save',
type: 'button'
}),
formActions = utils.markup('div', [clearAll, viewData, saveAll], {
className: 'form-actions btn-group'
});
if (opts.showActionButtons) {
// Build our headers and action links
var viewData = utils.markup('button', viewDataText, {
id: frmbID + '-view-data',
type: 'button',
className: 'view-data btn btn-default'
}),
clearAll = utils.markup('button', opts.messages.clearAll, {
id: frmbID + '-clear-all',
type: 'button',
className: 'clear-all btn btn-default'
}),
saveAll = utils.markup('button', opts.messages.save, {
className: 'btn btn-primary ' + opts.prefix + 'save',
id: frmbID + '-save',
type: 'button'
}),
formActions = utils.markup('div', [clearAll, viewData, saveAll], {
className: 'form-actions btn-group'
});
}

// Sortable fields
$sortableFields.sortable({
Expand Down Expand Up @@ -2494,44 +2506,43 @@ function formBuilderEventsFn() {
$(this).parents('li:eq(0)').toggleClass('delete');
});

// View XML
var xmlButton = $(document.getElementById(frmbID + '-view-data'));
xmlButton.click(function (e) {
e.preventDefault();
var data = utils.escapeHtml(formBuilder.formData),
code = utils.markup('code', data, { className: 'formData-' + opts.dataType }),
pre = utils.markup('pre', code);
_helpers.dialog(pre, null, 'data-dialog');
});
if (opts.showActionButtons) {
// View XML
var xmlButton = $(document.getElementById(frmbID + '-view-data'));
xmlButton.click(function (e) {
e.preventDefault();
_helpers.showData();
});

// Clear all fields in form editor
var clearButton = $(document.getElementById(frmbID + '-clear-all'));
clearButton.click(function () {
var fields = $('li.form-field');
var buttonPosition = this.getBoundingClientRect(),
bodyRect = document.body.getBoundingClientRect(),
coords = {
pageX: buttonPosition.left + buttonPosition.width / 2,
pageY: buttonPosition.top - bodyRect.top - 12
};
// Clear all fields in form editor
var clearButton = $(document.getElementById(frmbID + '-clear-all'));
clearButton.click(function () {
var fields = $('li.form-field');
var buttonPosition = this.getBoundingClientRect(),
bodyRect = document.body.getBoundingClientRect(),
coords = {
pageX: buttonPosition.left + buttonPosition.width / 2,
pageY: buttonPosition.top - bodyRect.top - 12
};

if (fields.length) {
_helpers.confirm(opts.messages.clearAllMessage, function () {
_helpers.removeAllfields();
opts.notify.success(opts.messages.allFieldsRemoved);
_helpers.save();
}, coords);
} else {
_helpers.dialog('There are no fields to clear', { pageX: coords.pageX, pageY: coords.pageY });
}
});
if (fields.length) {
_helpers.confirm(opts.messages.clearAllMessage, function () {
_helpers.removeAllfields();
opts.notify.success(opts.messages.allFieldsRemoved);
_helpers.save();
}, coords);
} else {
_helpers.dialog('There are no fields to clear', { pageX: coords.pageX, pageY: coords.pageY });
}
});

// Save Idea Template
$(document.getElementById(frmbID + '-save')).click(function (e) {
e.preventDefault();
_helpers.save();
_helpers.validateForm(e);
});
// Save Idea Template
$(document.getElementById(frmbID + '-save')).click(function (e) {
e.preventDefault();
_helpers.save();
_helpers.validateForm(e);
});
}

_helpers.getData();
loadFields();
Expand All @@ -2548,6 +2559,7 @@ function formBuilderEventsFn() {
// Make some actions accessible
formBuilder.actions = {
clearFields: _helpers.removeAllfields,
showData: _helpers.showData,
save: _helpers.save
};

Expand Down
4 changes: 2 additions & 2 deletions dist/form-builder.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/form-render.min.js
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions docs/formBuilder/options/showActionButtons.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# showActionButtons
When the option `showActionButtons` is set to false, the buttons for clearing the form controls, previewing the code and saving the form are not shown. By default the buttons are visible.

## Usage
```javascript
var options = {
showActionButtons: false
};
$(container).formBuilder(options);
```
110 changes: 57 additions & 53 deletions src/js/form-builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@
},
sortableControls: false,
stickyControls: false,
showActionButtons: true,
prefix: 'form-builder-'
};

Expand Down Expand Up @@ -356,25 +357,27 @@

let viewDataText = opts.dataType === 'xml' ? opts.messages.viewXML : opts.messages.viewJSON;

// Build our headers and action links
var viewData = utils.markup('button', viewDataText, {
id: frmbID + '-view-data',
type: 'button',
className: 'view-data btn btn-default'
}),
clearAll = utils.markup('button', opts.messages.clearAll, {
id: frmbID + '-clear-all',
type: 'button',
className: 'clear-all btn btn-default'
}),
saveAll = utils.markup('button', opts.messages.save, {
className: `btn btn-primary ${opts.prefix}save`,
id: frmbID + '-save',
type: 'button'
}),
formActions = utils.markup('div', [clearAll, viewData, saveAll], {
className: 'form-actions btn-group'
if (opts.showActionButtons) {
// Build our headers and action links
var viewData = utils.markup('button', viewDataText, {
id: frmbID + '-view-data',
type: 'button',
className: 'view-data btn btn-default'
}),
clearAll = utils.markup('button', opts.messages.clearAll, {
id: frmbID + '-clear-all',
type: 'button',
className: 'clear-all btn btn-default'
}),
saveAll = utils.markup('button', opts.messages.save, {
className: `btn btn-primary ${opts.prefix}save`,
id: frmbID + '-save',
type: 'button'
}),
formActions = utils.markup('div', [clearAll, viewData, saveAll], {
className: 'form-actions btn-group'
});
}

// Sortable fields
$sortableFields.sortable({
Expand Down Expand Up @@ -1205,44 +1208,44 @@
$(this).parents('li:eq(0)').toggleClass('delete');
});

// View XML
var xmlButton = $(document.getElementById(frmbID + '-view-data'));
xmlButton.click(function(e) {
e.preventDefault();
var data = utils.escapeHtml(formBuilder.formData),
code = utils.markup('code', data, { className: 'formData-' + opts.dataType }),
pre = utils.markup('pre', code);
_helpers.dialog(pre, null, 'data-dialog');
});

// Clear all fields in form editor
var clearButton = $(document.getElementById(frmbID + '-clear-all'));
clearButton.click(function() {
let fields = $('li.form-field');
let buttonPosition = this.getBoundingClientRect(),
bodyRect = document.body.getBoundingClientRect(),
coords = {
pageX: buttonPosition.left + (buttonPosition.width / 2),
pageY: (buttonPosition.top - bodyRect.top) - 12
};
if(opts.showActionButtons) {
// View XML
var xmlButton = $(document.getElementById(frmbID + '-view-data'));
xmlButton.click(function(e) {
e.preventDefault();
_helpers.showData();
});

if (fields.length) {
_helpers.confirm(opts.messages.clearAllMessage, function() {
_helpers.removeAllfields();
opts.notify.success(opts.messages.allFieldsRemoved);
_helpers.save();
}, coords);
} else {
_helpers.dialog('There are no fields to clear', { pageX: coords.pageX, pageY: coords.pageY });
}
});
// Clear all fields in form editor
var clearButton = $(document.getElementById(frmbID + '-clear-all'));
clearButton.click(function() {
let fields = $('li.form-field');
let buttonPosition = this.getBoundingClientRect(),
bodyRect = document.body.getBoundingClientRect(),
coords = {
pageX: buttonPosition.left + (buttonPosition.width / 2),
pageY: (buttonPosition.top - bodyRect.top) - 12
};

// Save Idea Template
$(document.getElementById(frmbID + '-save')).click(function(e) {
e.preventDefault();
_helpers.save();
_helpers.validateForm(e);
});
if (fields.length) {
_helpers.confirm(opts.messages.clearAllMessage, function() {
_helpers.removeAllfields();
opts.notify.success(opts.messages.allFieldsRemoved);
_helpers.save();
}, coords);
} else {
_helpers.dialog('There are no fields to clear', { pageX: coords.pageX, pageY: coords.pageY });
}
});

// Save Idea Template
$(document.getElementById(frmbID + '-save')).click(function(e) {
e.preventDefault();
_helpers.save();
_helpers.validateForm(e);
});
}

_helpers.getData();
loadFields();
Expand All @@ -1259,6 +1262,7 @@
// Make some actions accessible
formBuilder.actions = {
clearFields: _helpers.removeAllfields,
showData: _helpers.showData,
save: _helpers.save
};

Expand Down
10 changes: 10 additions & 0 deletions src/js/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,5 +981,15 @@ function formBuilderHelpersFn(opts, formBuilder) {

};

_helpers.showData = function() {

var data = utils.escapeHtml(formBuilder.formData),
code = utils.markup('code', data, { className: 'formData-' + opts.dataType }),
pre = utils.markup('pre', code);

_helpers.dialog(pre, null, 'data-dialog');

};

return _helpers;
}