scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-08 05:42:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Let Keyboard handlers know which view should receive keyboard focus.

Browse source
This commit is contained in:
Jürg Lehni 2011-05-16 00:17:37 +01:00
parent 3e71278b78
commit 78a9f9afe9
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/document/DocumentView.js
View file

@ -24,6 +24,7 @@ var DocumentView = this.DocumentView = Base.extend({
// To go with the convention of never passing document to constructors, // To go with the convention of never passing document to constructors,
// in all items, associate the view with the currently active document. // in all items, associate the view with the currently active document.
this._document = paper.document; this._document = paper.document;
this._scope = this._document._scope;
// Push it onto document.views and set index: // Push it onto document.views and set index:
this._index = this._document.views.push(this) - 1; this._index = this._document.views.push(this) - 1;
// Handle canvas argument // Handle canvas argument
@ -74,6 +75,9 @@ var DocumentView = this.DocumentView = Base.extend({
this._zoom = 1; this._zoom = 1;
this._events = this._createEvents(); this._events = this._createEvents();
DomEvent.add(this._canvas, this._events); DomEvent.add(this._canvas, this._events);
// Make sure the first view is focused for keyboard input straight away
if (!DocumentView.focused)
DocumentView.focused = this;
}, },
getDocument: function() { getDocument: function() {
@ -143,8 +147,9 @@ var DocumentView = this.DocumentView = Base.extend({
var res = Base.splice(this._document.views, null, this._index, 1); var res = Base.splice(this._document.views, null, this._index, 1);
// Uninstall event handlers again for this view. // Uninstall event handlers again for this view.
DomEvent.remove(this._canvas, this._events); DomEvent.remove(this._canvas, this._events);
this._document = this._scope = this._canvas = this._events = null;
// Clearing _onFrame makes the frame handler stop automatically. // Clearing _onFrame makes the frame handler stop automatically.
this._document = this._canvas = this._events = that._onFrame = null; this._onFrame = null;
return !!res.length; return !!res.length;
}, },
@ -199,7 +204,7 @@ var DocumentView = this.DocumentView = Base.extend({
return; return;
} }
// Set the global paper object to the current scope // Set the global paper object to the current scope
paper = that._document._scope; paper = that._scope;
// Request next frame already // Request next frame already
DomEvent.requestAnimationFrame(frame, that._canvas); DomEvent.requestAnimationFrame(frame, that._canvas);
running = true; running = true;
@ -222,7 +227,6 @@ var DocumentView = this.DocumentView = Base.extend({
_createEvents: function() { _createEvents: function() {
var that = this, var that = this,
scope = this._document._scope,
tool, tool,
timer, timer,
curPoint, curPoint,
@ -233,7 +237,9 @@ var DocumentView = this.DocumentView = Base.extend({
} }
function mousedown(event) { function mousedown(event) {
if (!(tool = scope.tool)) // Tell the Key class which view should receive keyboard input.
DocumentView.focused = that;
if (!(tool = that._scope.tool))
return; return;
curPoint = viewToArtwork(event); curPoint = viewToArtwork(event);
tool.onHandleEvent('mousedown', curPoint, event); tool.onHandleEvent('mousedown', curPoint, event);
@ -245,7 +251,7 @@ var DocumentView = this.DocumentView = Base.extend({
} }
function mousemove(event) { function mousemove(event) {
if (!(tool = scope.tool)) if (!(tool = that._scope.tool))
return; return;
// If the event was triggered by a touch screen device, prevent the // If the event was triggered by a touch screen device, prevent the
// default behaviour, as it will otherwise scroll the page: // default behaviour, as it will otherwise scroll the page:

9
src/ui/Key.js
View file

@ -64,17 +64,18 @@ var Key = this.Key = new function() {
function handleKey(down, keyCode, charCode, event) { function handleKey(down, keyCode, charCode, event) {
var character = String.fromCharCode(charCode), var character = String.fromCharCode(charCode),
key = keys[keyCode] || character.toLowerCase(), key = keys[keyCode] || character.toLowerCase(),
handler = down ? 'onKeyDown' : 'onKeyUp'; handler = down ? 'onKeyDown' : 'onKeyUp',
scope = DocumentView.focused && DocumentView.focused._scope,
tool = scope && scope.tool;
keyMap[key] = down; keyMap[key] = down;
if (paper.tool && paper.tool[handler]) { if (tool && tool[handler]) {
// Call the onKeyDown or onKeyUp handler if present // Call the onKeyDown or onKeyUp handler if present
// When the handler function returns false, prevent the // When the handler function returns false, prevent the
// default behaviour of the key event: // default behaviour of the key event:
// PORT: Add to Sg // PORT: Add to Sg
var keyEvent = new KeyEvent(down, key, character, event); var keyEvent = new KeyEvent(down, key, character, event);
if (paper.tool[handler](keyEvent) === false) { if (tool[handler](keyEvent) === false)
keyEvent.preventDefault(); keyEvent.preventDefault();
}
} }
} }