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

Arrow function caused object.assign polyfill to not work #92

Merged
merged 1 commit into from
Mar 16, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Changelog

- v1.9.6 - Bugfix: Arrows functions don't work with arguments.callee [#92](https://github.com/kevinchappell/formBuilder/pull/92)
- v1.9.5 - Bugfix: IE Element.remove() polyfill [#91](https://github.com/kevinchappell/formBuilder/pull/91)
- v1.9.4 - Bugfix: IE compatibility issues [#90](https://github.com/kevinchappell/formBuilder/pull/90)
- v1.9.3 - Bugfix: Update .jshintrc [#89](https://github.com/kevinchappell/formBuilder/pull/89)
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.9.5
formBuilder v1.9.6
===========

[![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.9.5",
"version": "1.9.6",
"main": [
"dist/*"
],
Expand Down
2 changes: 1 addition & 1 deletion demo/assets/css/demo.css

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

2 changes: 1 addition & 1 deletion demo/assets/css/form-builder.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
formBuilder - http://kevinchappell.github.io/formBuilder/
Version: 1.9.5
Version: 1.9.6
Author: Kevin Chappell <[email protected]>
*/
@charset "UTF-8";
Expand Down
2 changes: 1 addition & 1 deletion demo/assets/css/form-builder.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion 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.9.5
Version: 1.9.6
Author: Kevin Chappell <[email protected]>
*/
* {
Expand Down
2 changes: 1 addition & 1 deletion demo/assets/css/form-render.min.css

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

12 changes: 5 additions & 7 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.9.5
Version: 1.9.6
Author: Kevin Chappell <[email protected]>
*/
'use strict';
Expand Down Expand Up @@ -1298,9 +1298,9 @@ var formBuilderEvents = function formBuilderEvents(opts, _helpers) {
}];

values.values = values.values.map(function (elem, index) {

elem.label = opts.messages.option + ' ' + (index + 1);
elem.value = _helpers.hyphenCase(elem.label);

return elem;
});
}
Expand Down Expand Up @@ -2077,16 +2077,14 @@ var formBuilderEvents = function formBuilderEvents(opts, _helpers) {

if (typeof Object.assign !== 'function') {
(function () {
var _arguments = arguments;

Object.assign = function (target) {
Object.assign = function (target, args) {
if (target === undefined || target === null) {
throw new TypeError('Cannot convert undefined or null to object');
}

var output = Object(target);
for (var index = 1; index < _arguments.length; index++) {
var source = _arguments[index];
for (var index = 1; index < arguments.length; index++) {
var source = arguments[index];
if (source !== undefined && source !== null) {
for (var nextKey in source) {
if (source.hasOwnProperty(nextKey)) {
Expand Down
4 changes: 2 additions & 2 deletions demo/assets/js/form-builder.min.js

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions 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.9.5
Version: 1.9.6
Author: Kevin Chappell <[email protected]>
*/
'use strict';
Expand Down Expand Up @@ -182,9 +182,8 @@ var FormRender = function FormRender(options, element) {
fieldOptions.each(function (index, el) {
index = index;
var optionAttrs = _helpers.parseAttrs(el.attributes),
optionAttrsString = _helpers.attrString(optionAttrs),
optionText = el.innerHTML || el.innerContent || el.innerText || el.childNodes[0].nodeValue || el.value;
optionsMarkup += '<option ' + optionAttrsString + '>' + optionText + '</option>';
optionAttrsString = _helpers.attrString(optionAttrs);
optionsMarkup += '<option ' + optionAttrsString + '>' + el.textContent + '</option>';
});
}
fieldMarkup = fieldLabel + '<select ' + fieldAttrsString + '>' + optionsMarkup + '</select>';
Expand Down Expand Up @@ -288,7 +287,7 @@ var FormRender = function FormRender(options, element) {
var fieldAttrs = {};
for (var attr in attrNodes) {
if (attrNodes.hasOwnProperty(attr)) {
fieldAttrs[attrNodes[attr].nodeName] = attrNodes[attr].nodeValue;
fieldAttrs[attrNodes[attr].name] = attrNodes[attr].value;
}
}
return fieldAttrs;
Expand Down
Loading