Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix pop-up window positioning

Browse Source
This commit is contained in:
cjt
2012-02-05 10:23:06 -05:00
parent 332f498616
commit 45f3fe7ee0
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
js/schematic.js
View File

@@ -194,7 +194,6 @@ schematic = (function() {
this.canvas.style.borderStyle = 'solid'; this.canvas.style.borderStyle = 'solid';
this.canvas.style.borderWidth = '1px'; this.canvas.style.borderWidth = '1px';
this.canvas.style.borderColor = grid_style; this.canvas.style.borderColor = grid_style;
//this.canvas.style.position = 'absolute';
this.canvas.style.outline = 'none'; this.canvas.style.outline = 'none';
} }
@@ -274,6 +273,9 @@ schematic = (function() {
tr = document.createElement('tr'); tr = document.createElement('tr');
table.appendChild(tr); table.appendChild(tr);
td = document.createElement('td'); td = document.createElement('td');
td.style.position = 'relative'; // so we can position subwindows
td.style.left = '0';
td.style.top = '0';
tr.appendChild(td); tr.appendChild(td);
td.appendChild(this.canvas); td.appendChild(this.canvas);
td = document.createElement('td'); td = document.createElement('td');
@@ -1233,6 +1235,7 @@ schematic = (function() {
// just redraw dynamic components // just redraw dynamic components
sch.redraw(); sch.redraw();
//sch.message(sch.canvas.page_x + ',' + sch.canvas.page_y + ';' + sch.canvas.mouse_x + ',' + sch.canvas.mouse_y + ';' + sch.cursor_x + ',' + sch.cursor_y);
return false; return false;
} }
@@ -1474,9 +1477,9 @@ schematic = (function() {
win.appendChild(content); win.appendChild(content);
content.win = win; // so content can contact us content.win = win; // so content can contact us
// compute location in top-level div // compute location relative to canvas
win.left = this.canvas.page_x; win.left = this.canvas.mouse_x;
win.top = this.canvas.page_y; win.top = this.canvas.mouse_y;
// add to DOM // add to DOM
win.style.background = 'white'; win.style.background = 'white';
@@ -1486,7 +1489,8 @@ schematic = (function() {
win.style.top = win.top + 'px'; win.style.top = win.top + 'px';
win.style.border = '2px solid'; win.style.border = '2px solid';
this.input.parentNode.insertBefore(win,this.input.nextSibling); this.canvas.parentNode.insertBefore(win,this.canvas);
//this.input.parentNode.insertBefore(win,this.input.nextSibling);
} }
// close the window // close the window
@@ -1631,7 +1635,10 @@ schematic = (function() {
if (!event) event = window.event; if (!event) event = window.event;
var tool = (window.event) ? event.srcElement : event.target; var tool = (window.event) ? event.srcElement : event.target;
if (tool.enabled) tool.callback.call(tool.sch); if (tool.enabled) {
tool.sch.canvas.relMouseCoords(event); // so we can position pop-up window correctly
tool.callback.call(tool.sch);
}
} }
cut_icon = 'data:image/gif;base64,R0lGODlhEAAQALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//////yH5BAEAAAcALAAAAAAQABAAAAQu8MhJqz1g5qs7lxv2gRkQfuWomarXEgDRHjJhf3YtyRav0xcfcFgR0nhB5OwTAQA7'; cut_icon = 'data:image/gif;base64,R0lGODlhEAAQALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//////yH5BAEAAAcALAAAAAAQABAAAAQu8MhJqz1g5qs7lxv2gRkQfuWomarXEgDRHjJhf3YtyRav0xcfcFgR0nhB5OwTAQA7';