Skip to content

S
solo-1
Commit e6bd685d authored by Liang Ding's avatar Liang Ding
Browse files
Options

Merge remote-tracking branch 'origin/2.9.5-dev' into 2.9.5-dev

parents a11e3034 d8525b8d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/main/webapp/plugins/kanbanniang/assert/index.js
View file @ e6bd685d
...@@ -27,7 +27,7 @@ var soloKanbanniang = { ...@@ -27,7 +27,7 @@ var soloKanbanniang = {
} }
var dialog = this; var dialog = this;
var x = event.clientX - parseInt(dialog.style.left || 0), var x = event.clientX - parseInt(dialog.style.left || 0),
y = event.clientY - parseInt(dialog.style.top || 0); y = event.clientY - parseInt(dialog.style.top || $(window).height() - $(dialog).height());
_document.ondragstart = "return false;"; _document.ondragstart = "return false;";
_document.onselectstart = "return false;"; _document.onselectstart = "return false;";
_document.onselect = "document.selection.empty();"; _document.onselect = "document.selection.empty();";
...@@ -53,8 +53,8 @@ var soloKanbanniang = { ...@@ -53,8 +53,8 @@ var soloKanbanniang = {
if (positionY < 0) { if (positionY < 0) {
positionY = 0; positionY = 0;
} }
if (positionY > $('html').height() - $(dialog).height()) { if (positionY > $(window).height() - $(dialog).height()) {
positionY = $('html').height() - $(dialog).height(); positionY = $(window).height() - $(dialog).height();
} }
dialog.style.left = positionX + "px"; dialog.style.left = positionX + "px";
dialog.style.top = positionY + "px"; dialog.style.top = positionY + "px";
......
skins @ c2c29ee9
Subproject commit 4bd78b7cfa6e23403ee7383677f323fa137b230d Subproject commit c2c29ee93631faf3b69292de03345cc8740e5b8c
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment