[Skim-app-commit] SF.net SVN: skim-app:[12617] trunk/PDFSelection_SKExtensions.m

[hofman--- via Skim-app-commit]

Revision: 12617
          http://sourceforge.net/p/skim-app/code/12617
Author:   hofman
Date:     2021-12-11 18:54:01 +0000 (Sat, 11 Dec 2021)
Log Message:
-----------
Only check for special property specifier when not an array

Modified Paths:
--------------
    trunk/PDFSelection_SKExtensions.m

Modified: trunk/PDFSelection_SKExtensions.m
===================================================================
--- trunk/PDFSelection_SKExtensions.m   2021-12-11 18:36:07 UTC (rev 12616)
+++ trunk/PDFSelection_SKExtensions.m   2021-12-11 18:54:01 UTC (rev 12617)
@@ -459,18 +459,17 @@
 + (id)selectionWithSpecifier:(id)specifier onPage:(PDFPage *)aPage {
     if (specifier == nil || [specifier isEqual:[NSNull null]])
         return nil;
-    if ([specifier isKindOfClass:[NSArray class]] == NO)
+    if ([specifier isKindOfClass:[NSPropertySpecifier class]] &&
+        [[[specifier containerClassDescription] toManyRelationshipKeys] 
containsObject:[specifier key]] == NO &&
+        [[[specifier keyClassDescription] className] 
isEqualToString:RICH_TEXT_CLASSNAME] == NO) {
+        // this allows to use selection properties directly
+        specifier = [specifier objectsByEvaluatingSpecifier];
+        if (specifier == nil)
+            return nil;
+        else if ([specifier isKindOfClass:[NSArray class]] == NO)
+            specifier = [NSArray arrayWithObject:specifier];
+    } else if ([specifier isKindOfClass:[NSArray class]] == NO) {
         specifier = [NSArray arrayWithObject:specifier];
-    if ([specifier count] == 1) {
-        NSScriptObjectSpecifier *spec = [specifier objectAtIndex:0];
-        if ([spec isKindOfClass:[NSPropertySpecifier class]] &&
-            [[[spec containerClassDescription] toManyRelationshipKeys] 
containsObject:[spec key]] == NO &&
-            [[[spec keyClassDescription] className] 
isEqualToString:RICH_TEXT_CLASSNAME] == NO) {
-            // this allows to use selection properties directly
-            specifier = [spec objectsByEvaluatingSpecifier];
-            if ([specifier isKindOfClass:[NSArray class]] == NO)
-                specifier = [NSArray arrayWithObject:specifier];
-        }
     }
     
     NSMutableArray *selections = [NSMutableArray array];

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit