alex/yomichan
1
Fork 0
Code Releases Activity

more work on making popup be sized properly

Browse Source
This commit is contained in:
Alex Yatskov 2017-03-11 17:25:57 -08:00
parent 9ebcc8e2c1
commit 2c86e87576
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/fg/css/client.css
View File

@ -22,10 +22,8 @@ iframe#yomichan-popup {
background-color: #fff; background-color: #fff;
border: 1px solid #999; border: 1px solid #999;
box-shadow: 0 0 10px rgba(0, 0, 0, .5); box-shadow: 0 0 10px rgba(0, 0, 0, .5);
height: 250px;
position: fixed; position: fixed;
resize: both; resize: both;
visibility: hidden; visibility: hidden;
width: 400px;
z-index: 2147483647; z-index: 2147483647;
} }

17
ext/fg/js/popup.js
View File

@ -20,12 +20,16 @@
class Popup { class Popup {
constructor() { constructor() {
this.offset = 10; this.offset = 10;
this.minWidth = 400;
this.minHeight = 250;
this.container = document.createElement('iframe'); this.container = document.createElement('iframe');
this.container.id = 'yomichan-popup'; this.container.id = 'yomichan-popup';
this.container.addEventListener('mousedown', e => e.stopPropagation()); this.container.addEventListener('mousedown', e => e.stopPropagation());
this.container.addEventListener('scroll', e => e.stopPropagation()); this.container.addEventListener('scroll', e => e.stopPropagation());
this.container.setAttribute('src', chrome.extension.getURL('/fg/frame.html')); this.container.setAttribute('src', chrome.extension.getURL('/fg/frame.html'));
this.container.style.width=`${this.minWidth}px`;
this.container.style.height=`${this.minHeight}px`;
document.body.appendChild(this.container); document.body.appendChild(this.container);
} }
@ -43,23 +47,26 @@ class Popup {
const containerHeight = parseInt(containerStyle.height); const containerHeight = parseInt(containerStyle.height);
const containerWidth = parseInt(containerStyle.width); const containerWidth = parseInt(containerStyle.width);
const limitX = document.body.clientWidth;
const limitY = window.innerHeight;
let x = elementRect.left; let x = elementRect.left;
let width = containerWidth; let width = Math.max(containerWidth, this.minWidth);
const overflowX = Math.max(x + width - document.body.clientWidth, 0); const overflowX = Math.max(x + width - limitX, 0);
if (overflowX > 0) { if (overflowX > 0) {
if (x >= overflowX) { if (x >= overflowX) {
x -= overflowX; x -= overflowX;
} else { } else {
width = document.body.clientWidth; width = limitX;
x = 0; x = 0;
} }
} }
let y = 0; let y = 0;
let height = containerHeight; let height = Math.max(containerHeight, this.minHeight);
const yBelow = elementRect.bottom + this.offset; const yBelow = elementRect.bottom + this.offset;
const yAbove = elementRect.top - this.offset; const yAbove = elementRect.top - this.offset;
const overflowBelow = Math.max(yBelow + height - document.body.clientHeight, 0); const overflowBelow = Math.max(yBelow + height - limitY, 0);
const overflowAbove = Math.max(height - yAbove, 0); const overflowAbove = Math.max(height - yAbove, 0);
if (overflowBelow > 0 || overflowAbove > 0) { if (overflowBelow > 0 || overflowAbove > 0) {
if (overflowBelow < overflowAbove) { if (overflowBelow < overflowAbove) {