From 1db740039b514ea8915169972361e44e4d676080 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 20 Mar 2018 11:36:19 -0700 Subject: [PATCH 1/2] Fixed: Variable in if statement overshadows variable in enclosing block MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If statement variable ‘instantiatedObject’ on line 229 of _CPCibObjectData.j overshadows a variable with the same name declared on line 233 in the enclosing block. Variable is added to array outside the enclosing if statement. Refs: #2601 --- AppKit/Cib/_CPCibObjectData.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AppKit/Cib/_CPCibObjectData.j b/AppKit/Cib/_CPCibObjectData.j index fd91e22f1..5cfb03fa6 100644 --- a/AppKit/Cib/_CPCibObjectData.j +++ b/AppKit/Cib/_CPCibObjectData.j @@ -230,7 +230,7 @@ var _CPCibObjectDataNamesKeysKey = @"_CPCibObjectDataNamesKeysKey if ([object respondsToSelector:@selector(_cibInstantiate)]) { - var instantiatedObject = [object _cibInstantiate]; + instantiatedObject = [object _cibInstantiate]; if (instantiatedObject !== object) { From 6d06a26c31e170b4b8b11d4a0c923441dda1ef91 Mon Sep 17 00:00:00 2001 From: daboe01 Date: Mon, 26 Mar 2018 17:53:38 +0200 Subject: [PATCH 2/2] fixed: typo in method invocation --- AppKit/CoreAnimation/CALayer.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AppKit/CoreAnimation/CALayer.j b/AppKit/CoreAnimation/CALayer.j index 2230b7197..d7bb52982 100644 --- a/AppKit/CoreAnimation/CALayer.j +++ b/AppKit/CoreAnimation/CALayer.j @@ -522,7 +522,7 @@ var CALayerRegisteredRunLoopUpdates = nil; if (USE_BUFFER) { if (_delegateRespondsToDisplayLayerSelector) - return [_delegate displayInLayer:self]; + return [_delegate displayLayer:self]; if (CGRectGetWidth(_backingStoreFrame) == 0.0 || CGRectGetHeight(_backingStoreFrame) == 0.0) return;