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

[Issue #235 fix] Fixed scroll on reordering activities #236

Merged
merged 5 commits into from
Mar 11, 2020

Conversation

dhruvmisra
Copy link
Contributor

@dhruvmisra dhruvmisra commented Mar 5, 2020

Fixes #235
Removed the jquery-sortable dependency and handling the sorting and drag-and-drops using the already existing jquery-ui dependency. Calling the updateActivities() function only when the list has been updated reducing the unnecessary server calls. Also added a smooth animation while reordering.

dragScrollFix

@NikhilM98
Copy link
Collaborator

This will cause the List Chart view to crash. Fix it there too:
Screenshot from 2020-03-09 11-34-36

@dhruvmisra
Copy link
Contributor Author

@NikhilM98 Fixed the problem in my latest commit. Please review.

@NikhilM98
Copy link
Collaborator

Can you run npm run lint and fix the indentation.

@dhruvmisra
Copy link
Contributor Author

@NikhilM98 Something weird, the file had correct indentation on my IDE but messed some of it after the push. Fixed it nevertheless.

@NikhilM98
Copy link
Collaborator

Removed the jquery-sortable dependency

  • The dependency is still present (dashboard/public/js/jquery-sortable.js).
  • Can you add dashboard/public/js/jquery.ui.sortable-animation.js to .eslintignore and remove the deleted files from there too.

@dhruvmisra
Copy link
Contributor Author

@NikhilM98 Made the required changes.

@NikhilM98
Copy link
Collaborator

There are too many unnecessary changes in main.js. Can you limit the changes to your code (minimum required).

@dhruvmisra
Copy link
Contributor Author

That was the result of linting the file. All the indentations and spaces were reset which are showing up as new changes on git. The only changes I made were in initDragDrop() and initChartDragDrop().

@NikhilM98
Copy link
Collaborator

Yes, spaces were added in the whole file and those changes are unnecessary.

@dhruvmisra
Copy link
Contributor Author

@NikhilM98 Removed the unnecessary spaces.

@llaske llaske merged commit 2d08b19 into llaske:dev Mar 11, 2020
@llaske
Copy link
Owner

llaske commented Mar 11, 2020

Nice. Thanks.

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.

3 participants