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

Formalize modals #3898

Merged
merged 3 commits into from
Aug 26, 2017
Merged

Formalize modals #3898

merged 3 commits into from
Aug 26, 2017

Conversation

uberbrady
Copy link
Collaborator

Extracts out the duplicated javascript from the 3 places that were using the modal code -

  • assets/edit
  • assets/checkout
  • assets/bulk_checkout

It's now universally included once, and included in the Mix setup.

(As a side-note, I also removed the gulpfile.js, since having that as well as the webpack file both there at the same time was confusing, and lost me about half an hour or so)

Also, yanked out the password generation code for modal user-creation, and embedded it into the User modal itself. This means that assets/checkout and assets/bulk_checkout now all have access to the same password randomizing javascript code.

In the process, fixed the checkout and bulk-checkout views so that the new refactored modals worked for them as well.

@uberbrady uberbrady changed the base branch from master to develop August 26, 2017 23:05
@snipe snipe merged commit 6ad5da4 into develop Aug 26, 2017
@snipe snipe deleted the formalize_modals branch August 26, 2017 23:06
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