summaryrefslogtreecommitdiff
path: root/src/web
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-02-21 09:49:40 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-02-21 09:49:40 +0900
commitb0898e71518b948ed255cbe92f39c7ea1a996bd9 (patch)
treebddb291fc92516380ae949264bf4dd73cc56cb53 /src/web
parentwip (diff)
parentUpdate window.tag (diff)
downloadmisskey-b0898e71518b948ed255cbe92f39c7ea1a996bd9.tar.gz
misskey-b0898e71518b948ed255cbe92f39c7ea1a996bd9.tar.bz2
misskey-b0898e71518b948ed255cbe92f39c7ea1a996bd9.zip
Merge branch 'no-tag-ls' of https://github.com/syuilo/misskey into no-tag-ls
Diffstat (limited to 'src/web')
-rw-r--r--src/web/app/desktop/tags/window.tag12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/web/app/desktop/tags/window.tag b/src/web/app/desktop/tags/window.tag
index d2b3edb4d0..3e7da90769 100644
--- a/src/web/app/desktop/tags/window.tag
+++ b/src/web/app/desktop/tags/window.tag
@@ -435,12 +435,12 @@
const move = me.clientY - base;
if (top + height + move < browserHeight) {
if (height + move > this.minHeight) {
- return this.applyTransformHeight(height + move);
+ this.applyTransformHeight(height + move);
} else { // 最小の高さより小さくなろうとした時
- return this.applyTransformHeight(this.minHeight);
+ this.applyTransformHeight(this.minHeight);
}
} else { // 下のはみ出し時
- return this.applyTransformHeight(browserHeight - top);
+ this.applyTransformHeight(browserHeight - top);
}
});
};
@@ -459,14 +459,14 @@
if (left + move > 0) {
if (width + -move > this.minWidth) {
this.applyTransformWidth(width + -move);
- return this.applyTransformLeft(left + move);
+ this.applyTransformLeft(left + move);
} else { // 最小の幅より小さくなろうとした時
this.applyTransformWidth(this.minWidth);
- return this.applyTransformLeft(left + (width - this.minWidth));
+ this.applyTransformLeft(left + (width - this.minWidth));
}
} else { // 左のはみ出し時
this.applyTransformWidth(left + width);
- return this.applyTransformLeft(0);
+ this.applyTransformLeft(0);
}
});
};