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

Created new Picture Choice field #484

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

armine-fliplet
Copy link
Contributor

No description provided.

.idea/.gitignore Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

If you find that your IDE setup is adding new files like this .idea folder, you should update the .gitignore in the repo root to exclude the files.

css/form.css Outdated
@@ -1,5 +1,6 @@
.fl-form {
position: relative;
padding: 15px;
Copy link
Contributor

Choose a reason for hiding this comment

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

It's very unlikely that in order to add a new picture choice field, the entire form container needs a 15px padding around. This will introduce a breaking change to all the Form instances from our users.

@@ -77,26 +87,30 @@ Vue.directive('sortable', {
});

function generateFormDefaults(data) {
return _.assign({
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm able to open this file and save it without the linter or formatter making any changes (ref)

image

This suggests either you made this change manually or your editor is set up incorrectly.

@@ -182,7 +204,9 @@ Fliplet().then(function() {
}

if (this.newColumns.length > 1) {
return this.newColumns.length + ' columns missing in the data source.';
return (
Copy link
Contributor

Choose a reason for hiding this comment

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

Way too many unnecessary changes in this PR, see my comment above on IDE setup.

templates/configurations/pictureChoice.interface.hbs Outdated Show resolved Hide resolved
js/components/pictureChoice.js Outdated Show resolved Hide resolved
js/libs/form.js Outdated Show resolved Hide resolved
js/libs/form.js Outdated
@@ -611,6 +611,10 @@ Fliplet().then(function () {
}
}

if (type === 'flPictureChoice' && value ==='') {
value = {}
Copy link
Contributor

Choose a reason for hiding this comment

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

Semi-colon missing. Please check your IDE setup.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants