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.

Sign up for GitHub

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

Jump to bottom

Sortable Fix-Up #1793

Closed
wants to merge 12 commits into from
Closed

Sortable Fix-Up #1793

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
aa9de1a
Update sortable.js
borgboyone Feb 16, 2017
8b34513
Update sortable.js
borgboyone Feb 16, 2017
01cc678
Update sortable.js
borgboyone Feb 16, 2017
aa92211
Update sortable.js
borgboyone Feb 16, 2017
481c37f
Update sortable.js
borgboyone Feb 16, 2017
64d7655
Update sortable.js
borgboyone Feb 16, 2017
35215a8
Update sortable.js
borgboyone Feb 17, 2017
764b6b2
Update sortable.js
borgboyone Feb 17, 2017
93f77d9
Update sortable.js
borgboyone Feb 18, 2017
a8c660d
Update sortable.js
borgboyone Feb 18, 2017
5c4becc
Update sortable.js
borgboyone Feb 20, 2017
d76014e
Update sortable.js
borgboyone Feb 21, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update sortable.js 
* Removed scrollParent placeholder basis due to unknown difference between local copy and pushed copy functionality
  • Loading branch information
@borgboyone
borgboyone committed Feb 16, 2017
commit 481c37f104b2dd8a50b1e43014d43934e39f7de6
12 changes: 6 additions & 6 deletions ui/widgets/sortable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,9 @@ return $.widget( "ui.sortable", $.ui.mouse, {
//Cache the margins of the original element
this._cacheMargins();

//Get the next scrolling parent
this.scrollParent = this.helper.scrollParent();

//The element's absolute position on the page minus margins
this.offset = this.currentItem.offset();
this.offset = {
Expand Down Expand Up @@ -260,9 +263,6 @@ return $.widget( "ui.sortable", $.ui.mouse, {
//Create the placeholder
this._createPlaceholder();

//Get the next scrolling parent (based on the placeholder in case the helper is appended)
this.scrollParent = this.placeholder.scrollParent();

//Set a containment if given in the options
if ( o.containment ) {
this._setContainment();
Expand Down Expand Up @@ -1086,12 +1086,12 @@ return $.widget( "ui.sortable", $.ui.mouse, {
this.containers[ innermostIndex ]._trigger( "change", event, this._uiHash( this ) );
this.currentContainer = this.containers[ innermostIndex ];

//Update scrollParent
this.scrollParent = this.helper.scrollParent();

//Update the placeholder
this.options.placeholder.update( this.currentContainer, this.placeholder );

//Update scrollParent
this.scrollParent = this.placeholder.scrollParent();

this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash( this ) );
this.containers[ innermostIndex ].containerCache.over = 1;
}
Expand Down