callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadway: Fix up a bunch of js style issues

Browse Source
This commit is contained in:
Alexander Larsson
2011-03-11 21:12:57 +01:00
parent cc808ae063
commit 54905a8986
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
gdk/broadway/broadway.js
View File

@ -74,16 +74,16 @@ var input_socket = null;
function initContext(canvas, x, y, id) function initContext(canvas, x, y, id)
{ {
canvas.surface_id = id; canvas.surface_id = id;
canvas.style["position"] = "absolute" canvas.style["position"] = "absolute";
canvas.style["left"] = x + "px" canvas.style["left"] = x + "px";
canvas.style["top"] = y + "px" canvas.style["top"] = y + "px";
canvas.style["display"] = "none" canvas.style["display"] = "none";
context = canvas.getContext("2d") var context = canvas.getContext("2d");
context.globalCompositeOperation = "src-over" context.globalCompositeOperation = "src-over";
context.fillRect(0, 0, canvas.width, canvas.height); context.fillRect(0, 0, canvas.width, canvas.height);
document.body.appendChild(canvas) document.body.appendChild(canvas);
return context return context;
} }
function handleCommands(cmd_obj) function handleCommands(cmd_obj)
@ -132,8 +132,8 @@ function handleCommands(cmd_obj)
case 'd': case 'd':
var id = base64_16(cmd, i); var id = base64_16(cmd, i);
i = i + 3; i = i + 3;
var canvas = surfaces[id].canvas var canvas = surfaces[id].canvas;
delete surfaces[id] delete surfaces[id];
canvas.parentNode.removeChild(canvas); canvas.parentNode.removeChild(canvas);
break; break;
@ -175,13 +175,13 @@ function handleCommands(cmd_obj)
var url = cmd.slice(i, i + size); var url = cmd.slice(i, i + size);
i = i + size; i = i + size;
var img = new Image(); var img = new Image();
img.src = url img.src = url;
if (img.complete) { if (img.complete) {
surfaces[id].drawImage(img, x, y); surfaces[id].drawImage(img, x, y);
} else { } else {
cmd_obj.pos = i; cmd_obj.pos = i;
img.onload = function() { surfaces[id].drawImage(img, x, y); handleOutstanding(); } img.onload = function() { surfaces[id].drawImage(img, x, y); handleOutstanding(); };
return false return false;
} }
break; break;
@ -229,7 +229,7 @@ function handleCommands(cmd_obj)
} }
} }
context.clip() context.clip();
var dx = base64_16s(cmd, i); var dx = base64_16s(cmd, i);
i = i + 3; i = i + 3;
@ -276,7 +276,7 @@ function handleLoad(event)
outstanding_commands.push(cmd_obj); outstanding_commands.push(cmd_obj);
if (outstanding_commands.length == 1) { if (outstanding_commands.length == 1) {
handleOutstanding() handleOutstanding();
} }
} }
@ -401,10 +401,10 @@ function on_mouse_wheel(ev)
var pos = getPositionsFromEvent(ev, id); var pos = getPositionsFromEvent(ev, id);
var offset = ev.detail ? ev.detail : ev.wheelDelta; var offset = ev.detail ? ev.detail : ev.wheelDelta;
var dir = 0 var dir = 0;
if (offset > 0) if (offset > 0)
dir = 1; dir = 1;
send_input ("s", [id, pos.root_x, pos.root_y, pos.win_x, pos.win_y, ev.timeStamp, dir]) send_input ("s", [id, pos.root_x, pos.root_y, pos.win_x, pos.win_y, ev.timeStamp, dir]);
return cancel_event(ev); return cancel_event(ev);
} }
@ -437,7 +437,7 @@ function connect()
} else { } else {
alert("WebSocket not supported, input will not work!"); alert("WebSocket not supported, input will not work!");
} }
document.oncontextmenu = function () { return false; } document.oncontextmenu = function () { return false; };
document.onmousemove = on_mouse_move; document.onmousemove = on_mouse_move;
document.onmouseover = on_mouse_over; document.onmouseover = on_mouse_over;
document.onmouseout = on_mouse_out; document.onmouseout = on_mouse_out;