natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'no-tag-ls' of https://github.com/syuilo/misskey into no-tag-ls

This commit is contained in:
syuilo 2017-02-21 09:49:40 +09:00
parent b66bac7851 2f840733d7
commit b0898e7151
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/web/app/desktop/tags/window.tag
View File

@ -435,12 +435,12 @@
const move = me.clientY - base; const move = me.clientY - base;
if (top + height + move < browserHeight) { if (top + height + move < browserHeight) {
if (height + move > this.minHeight) { if (height + move > this.minHeight) {
return this.applyTransformHeight(height + move); this.applyTransformHeight(height + move);
} else { // 最小の高さより小さくなろうとした時 } else { // 最小の高さより小さくなろうとした時
return this.applyTransformHeight(this.minHeight); this.applyTransformHeight(this.minHeight);
} }
} else { // 下のはみ出し時 } else { // 下のはみ出し時
return this.applyTransformHeight(browserHeight - top); this.applyTransformHeight(browserHeight - top);
} }
}); });
}; };
@ -459,14 +459,14 @@
if (left + move > 0) { if (left + move > 0) {
if (width + -move > this.minWidth) { if (width + -move > this.minWidth) {
this.applyTransformWidth(width + -move); this.applyTransformWidth(width + -move);
return this.applyTransformLeft(left + move); this.applyTransformLeft(left + move);
} else { // 最小の幅より小さくなろうとした時 } else { // 最小の幅より小さくなろうとした時
this.applyTransformWidth(this.minWidth); this.applyTransformWidth(this.minWidth);
return this.applyTransformLeft(left + (width - this.minWidth)); this.applyTransformLeft(left + (width - this.minWidth));
} }
} else { // 左のはみ出し時 } else { // 左のはみ出し時
this.applyTransformWidth(left + width); this.applyTransformWidth(left + width);
return this.applyTransformLeft(0); this.applyTransformLeft(0);
} }
}); });
}; };