scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-03-13 16:33:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify paper scope switching code for now, as key handling code depends on paper object to always point to a valid one. This is a workaround, rethinking of how key handling should be distributed across multiple instances within one page is required.

Browse source
This commit is contained in:
Jürg Lehni 2011-05-14 20:08:14 +01:00
parent ed2ef0231f
commit 064f3e05d3
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/core/PaperScript.js
View file

@ -130,8 +130,8 @@ var PaperScript = this.PaperScript = new function() {
}
function run(code, scope) {
try { with (scope) { // Safe one indentation by grouping try and with
PaperScope.set(scope);
with (scope) { // Safe one indentation by grouping try and with
paper = scope;
var doc = scope.document;
// TODO: Add support for multiple tools
var tool = scope.tool =
@ -158,7 +158,7 @@ var PaperScript = this.PaperScript = new function() {
var totalTime = 0;
function frame(dontSwitch) {
if (!dontSwitch)
PaperScope.set(scope);
paper = scope;
// Request next frame already
DomEvent.requestAnimationFrame(frame, doc && doc.canvas);
var time = Date.now() / 1000;
@ -174,8 +174,6 @@ var PaperScript = this.PaperScript = new function() {
if (doc)
doc.redraw();
lastTime = time;
if (!dontSwitch)
PaperScope.restore();
};
// Call the onFrame handler and redraw the document:
frame(true);
@ -185,8 +183,6 @@ var PaperScript = this.PaperScript = new function() {
doc.redraw();
}
return res;
} } finally {
PaperScope.restore();
}
}
@ -223,9 +219,8 @@ var PaperScript = this.PaperScript = new function() {
var canvas = script.getAttribute('canvas');
if (canvas = canvas && document.getElementById(canvas)) {
// Create a Document for this canvas, using the right scope
PaperScope.set(scope);
paper = scope;
new Document(canvas);
PaperScope.restore();
}
if (script.src) {
request(script.src, scope);

3
src/tool/ToolHandler.js
View file

@ -121,7 +121,7 @@ var ToolHandler = this.ToolHandler = Base.extend({
},
onHandleEvent: function(type, pt, event) {
PaperScope.set(this._scope);
paper = this._scope;
switch (type) {
case 'mousedown':
this.updateEvent(type, pt, null, null, true, false, false);
@ -178,6 +178,5 @@ var ToolHandler = this.ToolHandler = Base.extend({
}
break;
}
PaperScope.restore();
}
});