Skip to content

fix dimension calculation with margin and wrong each function in destroy #73

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

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

fix dimension calculation with margin and wrong each function in destroy #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60980c0
Update jquery.splitter.css
k2s Jul 30, 2020
3299aaa
Update jquery.splitter.js
k2s Jul 30, 2020
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 css/jquery.splitter.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
.splitter_panel .vertical_panel {
position: absolute;
overflow: auto;
box-sizing: border-box;
}

.splitter_panel .vsplitter,
Expand Down
14 changes: 8 additions & 6 deletions js/jquery.splitter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,12 +219,14 @@
} else {
var s_sum = splitter_dim * i;
var props = {};
var correction = settings.orientation == 'vertical'
? parseInt(panels[i].css('marginLeft')) + parseInt(panels[i].css('marginRight'))
: parseInt(panels[i].css('marginTop')) + parseInt(panels[i].css('marginBottom'));
props[dim_name] = dim_px - pw - sw_sum - correction;
props[pos_name] = pw + sw_sum;
if (settings.percent) {
props[dim_name] = (dim_px - pw - sw_sum) / dim_px * 100 + '%';
props[pos_name] = (pw + sw_sum) / dim_px * 100 + '%';
} else {
props[dim_name] = dim_px - pw - sw_sum;
props[pos_name] = pw + sw_sum;
props[dim_name] = props[dim_name] / dim_px * 100 + '%';
props[pos_name] = props[pos_name] / dim_px * 100 + '%';
}
panel_last.css(props);
}
Expand Down Expand Up @@ -266,7 +268,7 @@
self.find('.splitter_panel').trigger('splitter.resize');
splitters[id] = null;
count--;
$splitters.each(function() {
$($splitters).each(function() {
var splitter = $(this);
splitter.off('mouseenter');
splitter.off('mouseleave');
Expand Down