From 74cd11c763ee7cc423bff8fabd6d9601c5e63e55 Mon Sep 17 00:00:00 2001 From: daboe01 Date: Mon, 26 Dec 2016 14:50:33 +0100 Subject: [PATCH] minor cleanup --- AppKit/CPTextView/CPTextView.j | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/AppKit/CPTextView/CPTextView.j b/AppKit/CPTextView/CPTextView.j index 3ff43f3e2..ae3e4b529 100644 --- a/AppKit/CPTextView/CPTextView.j +++ b/AppKit/CPTextView/CPTextView.j @@ -1028,6 +1028,7 @@ var kDelegateRespondsTo_textShouldBeginEditing - (void)mouseDragged:(CPEvent)event { + if (![self isSelectable]) return; @@ -1054,9 +1055,6 @@ var kDelegateRespondsTo_textShouldBeginEditing - (void)mouseUp:(CPEvent)event { - if (![self isSelectable]) - return; - _movingSelection = nil; // will post CPTextViewDidChangeSelectionNotification @@ -2103,11 +2101,11 @@ var kDelegateRespondsTo_textShouldBeginEditing - (BOOL)isSelectable { - return [super isSelectable] && !_placeholderString + return [super isSelectable] && _placeholderString === nil; } - (BOOL)isEditable { - return [super isEditable] && !_placeholderString + return [super isEditable] && _placeholderString === nil; } - (void)_setPlaceholderString:(CPString)aString