From a989bf104c61715fc25e77421a31cb677064f888 Mon Sep 17 00:00:00 2001 From: Devin Torres Date: Wed, 19 May 2010 14:35:15 -0500 Subject: [PATCH] Don't assume responder was passed in makeFirstResponder --- .gitignore | 1 + frameworks/foundation/mixins/responder_context.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f72f87b75..3e2c6da78 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ .gitattributes *.swp *.swo +tmp/ diff --git a/frameworks/foundation/mixins/responder_context.js b/frameworks/foundation/mixins/responder_context.js index 99c8d4ea2..133a2b082 100644 --- a/frameworks/foundation/mixins/responder_context.js +++ b/frameworks/foundation/mixins/responder_context.js @@ -139,7 +139,7 @@ SC.ResponderContext = { console.log('%@: makeFirstResponder => %@'.fmt(this, this.responderNameFor(responder))); } - responder.set("becomingFirstResponder", YES); + if (responder) responder.set("becomingFirstResponder", YES); this._locked = YES; this._pendingResponder = null; @@ -178,7 +178,7 @@ SC.ResponderContext = { this._pendingResponder = null; } - responder.set("becomingFirstResponder", NO); + if (responder) responder.set("becomingFirstResponder", NO); return this ; },