Revision: 24250
          http://sourceforge.net/p/bibdesk/svn/24250
Author:   hofman
Date:     2019-09-29 13:58:09 +0000 (Sun, 29 Sep 2019)
Log Message:
-----------
allow value transformer binding option

Modified Paths:
--------------
    trunk/bibdesk/BDSKColorLabelWell.m

Modified: trunk/bibdesk/BDSKColorLabelWell.m
===================================================================
--- trunk/bibdesk/BDSKColorLabelWell.m  2019-09-29 13:54:24 UTC (rev 24249)
+++ trunk/bibdesk/BDSKColorLabelWell.m  2019-09-29 13:58:09 UTC (rev 24250)
@@ -260,11 +260,14 @@
         NSString *observedKeyPath = [info objectForKey:NSObservedKeyPathKey];
         if (observedObject && observedKeyPath) {
             id value = color;
-            NSString *transformerName = [[info objectForKey:NSOptionsKey] 
objectForKey:NSValueTransformerNameBindingOption];
-            if (transformerName && [transformerName isEqual:[NSNull null]] == 
NO) {
-                NSValueTransformer *valueTransformer = [NSValueTransformer 
valueTransformerForName:transformerName];
+            NSValueTransformer *valueTransformer = [info 
objectForKey:NSValueTransformerBindingOption];
+            if (valueTransformer == nil || [valueTransformer isEqual:[NSNull 
null]]) {
+                NSString *transformerName = [[info objectForKey:NSOptionsKey] 
objectForKey:NSValueTransformerNameBindingOption];
+                if (transformerName && [transformerName isEqual:[NSNull null]] 
== NO)
+                    valueTransformer = [NSValueTransformer 
valueTransformerForName:transformerName];
+            }
+            if (valueTransformer && [valueTransformer isEqual:[NSNull null]] 
== NO)
                 value = [valueTransformer reverseTransformedValue:value];
-            }
             [observedObject setValue:value forKeyPath:observedKeyPath];
         }
         if ([self action])

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



_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit

Reply via email to