diff --git a/Frameworks/AppKit/Browser.environment/AppKit.sj b/Frameworks/AppKit/Browser.environment/AppKit.sj index 56e5372dc..2590cfb99 100644 --- a/Frameworks/AppKit/Browser.environment/AppKit.sj +++ b/Frameworks/AppKit/Browser.environment/AppKit.sj @@ -64590,7 +64590,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("_rowType"), function $_ ,["void","CPNotification"])]); } -p;19;CPPredicateEditor.jt;32053;@STATIC;1.0;i;14;CPRuleEditor.ji;24;_CPPredicateEditorTree.ji;27;_CPPredicateEditorRowNode.ji;30;CPPredicateEditorRowTemplate.jt;31918;objj_executeFile("CPRuleEditor.j", YES);objj_executeFile("_CPPredicateEditorTree.j", YES);objj_executeFile("_CPPredicateEditorRowNode.j", YES);objj_executeFile("CPPredicateEditorRowTemplate.j", YES); +p;19;CPPredicateEditor.jt;32088;@STATIC;1.0;i;14;CPRuleEditor.ji;24;_CPPredicateEditorTree.ji;27;_CPPredicateEditorRowNode.ji;30;CPPredicateEditorRowTemplate.jt;31953;objj_executeFile("CPRuleEditor.j", YES);objj_executeFile("_CPPredicateEditorTree.j", YES);objj_executeFile("_CPPredicateEditorRowNode.j", YES);objj_executeFile("CPPredicateEditorRowTemplate.j", YES); {var the_class = objj_allocateClassPair(CPRuleEditor, "CPPredicateEditor"), meta_class = the_class.isa;class_addIvars(the_class, [new objj_ivar("_allTemplates", "CPArray"), new objj_ivar("_rootTrees", "CPArray"), new objj_ivar("_rootHeaderTrees", "CPArray"), new objj_ivar("_predicateTarget", "id"), new objj_ivar("_predicateAction", "SEL")]);objj_registerClassPair(the_class); class_addMethods(the_class, [new objj_method(sel_getUid("target"), function $CPPredicateEditor__target(self, _cmd) @@ -64791,14 +64791,16 @@ class_addMethods(the_class, [new objj_method(sel_getUid("target"), function $CPP var animation = self._currentAnimation; self._currentAnimation = nil; self._sendAction = NO; + var rows = []; if (predicate != nil) { if ((self._nestingMode == CPRuleEditorNestingModeSimple || self._nestingMode == CPRuleEditorNestingModeCompound) && (predicate == null ? predicate : (predicate.isa.method_msgSend["isKindOfClass:"] || _objj_forward)(predicate, "isKindOfClass:", (CPComparisonPredicate.isa.method_msgSend["class"] || _objj_forward)(CPComparisonPredicate, "class")))) predicate = ((___r1 = (CPCompoundPredicate.isa.method_msgSend["alloc"] || _objj_forward)(CPCompoundPredicate, "alloc")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["initWithType:subpredicates:"] || _objj_forward)(___r1, "initWithType:subpredicates:", (self.isa.method_msgSend["_compoundPredicateTypeForRootRows"] || _objj_forward)(self, "_compoundPredicateTypeForRootRows"), (CPArray.isa.method_msgSend["arrayWithObject:"] || _objj_forward)(CPArray, "arrayWithObject:", predicate))); var row = (self.isa.method_msgSend["_rowObjectFromPredicate:"] || _objj_forward)(self, "_rowObjectFromPredicate:", predicate); if (row != nil) - ((___r1 = self._boundArrayOwner), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["setValue:forKey:"] || _objj_forward)(___r1, "setValue:forKey:", (CPArray.isa.method_msgSend["arrayWithObject:"] || _objj_forward)(CPArray, "arrayWithObject:", row), self._boundArrayKeyPath)); + (rows == null ? rows : (rows.isa.method_msgSend["addObject:"] || _objj_forward)(rows, "addObject:", row)); } + ((___r1 = self._boundArrayOwner), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["setValue:forKey:"] || _objj_forward)(___r1, "setValue:forKey:", rows, self._boundArrayKeyPath)); (self.isa.method_msgSend["setAnimation:"] || _objj_forward)(self, "setAnimation:", animation); var ___r1; } diff --git a/Frameworks/AppKit/CommonJS.environment/AppKit.sj b/Frameworks/AppKit/CommonJS.environment/AppKit.sj index 32589641e..c46c07c91 100644 --- a/Frameworks/AppKit/CommonJS.environment/AppKit.sj +++ b/Frameworks/AppKit/CommonJS.environment/AppKit.sj @@ -62463,7 +62463,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("_rowType"), function $_ ,["void","CPNotification"])]); } -p;19;CPPredicateEditor.jt;32053;@STATIC;1.0;i;14;CPRuleEditor.ji;24;_CPPredicateEditorTree.ji;27;_CPPredicateEditorRowNode.ji;30;CPPredicateEditorRowTemplate.jt;31918;objj_executeFile("CPRuleEditor.j", YES);objj_executeFile("_CPPredicateEditorTree.j", YES);objj_executeFile("_CPPredicateEditorRowNode.j", YES);objj_executeFile("CPPredicateEditorRowTemplate.j", YES); +p;19;CPPredicateEditor.jt;32088;@STATIC;1.0;i;14;CPRuleEditor.ji;24;_CPPredicateEditorTree.ji;27;_CPPredicateEditorRowNode.ji;30;CPPredicateEditorRowTemplate.jt;31953;objj_executeFile("CPRuleEditor.j", YES);objj_executeFile("_CPPredicateEditorTree.j", YES);objj_executeFile("_CPPredicateEditorRowNode.j", YES);objj_executeFile("CPPredicateEditorRowTemplate.j", YES); {var the_class = objj_allocateClassPair(CPRuleEditor, "CPPredicateEditor"), meta_class = the_class.isa;class_addIvars(the_class, [new objj_ivar("_allTemplates", "CPArray"), new objj_ivar("_rootTrees", "CPArray"), new objj_ivar("_rootHeaderTrees", "CPArray"), new objj_ivar("_predicateTarget", "id"), new objj_ivar("_predicateAction", "SEL")]);objj_registerClassPair(the_class); class_addMethods(the_class, [new objj_method(sel_getUid("target"), function $CPPredicateEditor__target(self, _cmd) @@ -62664,14 +62664,16 @@ class_addMethods(the_class, [new objj_method(sel_getUid("target"), function $CPP var animation = self._currentAnimation; self._currentAnimation = nil; self._sendAction = NO; + var rows = []; if (predicate != nil) { if ((self._nestingMode == CPRuleEditorNestingModeSimple || self._nestingMode == CPRuleEditorNestingModeCompound) && (predicate == null ? predicate : (predicate.isa.method_msgSend["isKindOfClass:"] || _objj_forward)(predicate, "isKindOfClass:", (CPComparisonPredicate.isa.method_msgSend["class"] || _objj_forward)(CPComparisonPredicate, "class")))) predicate = ((___r1 = (CPCompoundPredicate.isa.method_msgSend["alloc"] || _objj_forward)(CPCompoundPredicate, "alloc")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["initWithType:subpredicates:"] || _objj_forward)(___r1, "initWithType:subpredicates:", (self.isa.method_msgSend["_compoundPredicateTypeForRootRows"] || _objj_forward)(self, "_compoundPredicateTypeForRootRows"), (CPArray.isa.method_msgSend["arrayWithObject:"] || _objj_forward)(CPArray, "arrayWithObject:", predicate))); var row = (self.isa.method_msgSend["_rowObjectFromPredicate:"] || _objj_forward)(self, "_rowObjectFromPredicate:", predicate); if (row != nil) - ((___r1 = self._boundArrayOwner), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["setValue:forKey:"] || _objj_forward)(___r1, "setValue:forKey:", (CPArray.isa.method_msgSend["arrayWithObject:"] || _objj_forward)(CPArray, "arrayWithObject:", row), self._boundArrayKeyPath)); + (rows == null ? rows : (rows.isa.method_msgSend["addObject:"] || _objj_forward)(rows, "addObject:", row)); } + ((___r1 = self._boundArrayOwner), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["setValue:forKey:"] || _objj_forward)(___r1, "setValue:forKey:", rows, self._boundArrayKeyPath)); (self.isa.method_msgSend["setAnimation:"] || _objj_forward)(self, "setAnimation:", animation); var ___r1; } diff --git a/Resources/recipes.txt b/Resources/recipes.txt index 36ac49f38..b5020738e 100644 --- a/Resources/recipes.txt +++ b/Resources/recipes.txt @@ -1,144 +1,144 @@ -1775221041255|ArrayController1| -1775221041269|ArrayControllerInitialSelectionTest| -1775221041282|ArrayControllerRemovingFirstTest| -1775221041295|AttachedSheet| -1775221041308|AttachedSheet2| -1775221041322|Bindings| -1775221041335|CGCanvasContext| -1775221041348|CGPath| -1775221041361|CPAlertTest| -1775221041375|CPAnimatablePropertyContainerTest| -1775221041388|CPAnimationContextTest| -1775221041401|CPAnimationTest| -1775221041414|CPBinder-echo-bug| -1775221041427|CPBoxCibTest| -1775221041441|CPBoxTest| -1775221041454|CPBrowserTest| -1775221041467|CPButtonKeyEquivalentDefaultTest| -1775221041481|CPButtonTest| -1775221041494|CPByteCountFormatter| -1775221041507|CPCollectionViewNibTest| -1775221041520|CPColor-CPImage-description| -1775221041534|CPColorWellBindings| -1775221041547|CPComboBoxTest| -1775221041560|CPControlPerformClickExceptionTest| -1775221041573|CPControlSize| -1775221041587|CPCursor| -1775221041600|CPDateFormatterTest| -1775221041613|CPDatePickerTest| -1775221041626|CPDictionaryControllerTest| -1775221041640|CPDocumentControllerTest| -1775221041653|CPFormatterTest| -1775221041666|CPGraphicsTest| -1775221041680|CPImageAndTextViewImageScaling| -1775221041693|CPImageViewAlignmentScaling| -1775221041706|CPImageViewTest| -1775221041720|CPImageViewbindingsTest| -1775221041733|CPLevelIndicator| -1775221041746|CPLocalizationTest| -1775221041759|CPLogTest| -1775221041773|CPMenuCALayerTest| -1775221041786|CPMenuEnabledBindingsTest| -1775221041799|CPMenuKeyEquivalents| -1775221041813|CPMenuRemoveAllTest| -1775221041826|CPMenuSubmenuPlacementConstraints| -1775221041839|CPMenuTest| -1775221041852|CPOutlineViewCibTest| -1775221041866|CPOutlineViewTest| -1775221041879|CPOutlineViewViewBasedCibTest| -1775221041892|CPPanelTest| -1775221041906|CPPlatformWindow| -1775221041919|CPPlattformWindowMinSize| -1775221041932|CPPopUpButtonBindings| -1775221041945|CPPopUpButtonTest| -1775221041958|CPPopover| -1775221041972|CPPredicateEditorCibTest| -1775221041985|CPProgressIndicator| -1775221041998|CPPropertyListSerializationTest| -1775221042012|CPRadioBindings| -1775221042025|CPRuleEditorCibTest| -1775221042038|CPScrollView| -1775221042052|CPScrollView2| -1775221042065|CPSearchField| -1775221042079|CPSearchFieldPredicateBinding| -1775221042093|CPSegmentedControlBindings| -1775221042107|CPSegmentedControlTest| -1775221042120|CPSoundTest| -1775221042134|CPSplitViewDivider| -1775221042147|CPSplitViewTest| -1775221042160|CPStackViewTest| -1775221042173|CPStepperBindings| -1775221042187|CPStepperNibTest| -1775221042200|CPTabView2| -1775221042213|CPTabViewBindings| -1775221042227|CPTabViewNib| -1775221042240|CPTableViewGroupRows| -1775221042253|CPTextField| -1775221042266|CPTextFieldEditingStyleTest| -1775221042279|CPTextFieldHeightTest| -1775221042293|CPTextFieldMovementsTest| -1775221042306|CPTextFieldMultiline| -1775221042319|CPTextView| -1775221042333|CPTextViewCibTest| -1775221042346|CPTextViewDelegateAndNotifications| -1775221042359|CPTimeZone| -1775221042372|CPTokenFieldTest| -1775221042386|CPToolTip| -1775221042399|CPToolbarTest| -1775221042412|CPTreeControllerTest| -1775221042425|CPURLConnectionAsyncTest| -1775221042439|CPURLConnectionSynchronousTest| -1775221042452|CPUserDefaults| -1775221042466|CPUserDefaultsControllerTest| -1775221042480|CPUserNotificationTest| -1775221042494|CPViewController| -1775221042507|CPVisualEffectViewTest| -1775221042521|CPWebViewTest| -1775221042534|CPWebViewTest2| -1775221042547|CPWindowLiveResizeTest| -1775221042560|CPWindowMovableTest| -1775221042574|CPWindowResizeStyle| -1775221042587|ChildWindows| -1775221042600|CompilationTests| -1775221042613|ContinuouslyUpdatesValueBinding| -1775221042627|CopyAndPaste| -1775221042640|CrossOriginTest| -1775221042653|FF4096Test| -1775221042666|FontEnhancementTest| -1775221042680|FontMetricsExplorer| -1775221042693|KeyEquivalents| -1775221042706|KeyViewLoopTest| -1775221042720|KeyWindowInTheBackgroundActivation| -1775221042733|LayoutTest| -1775221042746|LoadTimeTest| -1775221042759|LongBindings| -1775221042773|MobileTest| -1775221042786|MultipleValueBindings| -1775221042799|NSBoxTest| -1775221042812|NSBrowserTest| -1775221042826|NewTextFieldBezel| -1775221042839|Nib2CibAlignment| -1775221042852|Nib2CibBaselineAlignementTest| -1775221042866|Nib2CibSubviewsOrderTest| -1775221042879|NibAppRemixed| -1775221042892|PatternFillTest| -1775221042906|PlatformWindows| -1775221042919|PopUpButtonEscTest| -1775221042932|ScalingTest| -1775221042945|ScalingTest2| -1775221042959|ScrollviewTheming| -1775221042972|SheetWindowOrderFrontIssue| -1775221042985|SimpleBindings2| -1775221042998|SmartFoldersDemo| -1775221043011|TableTest| -1775221043025|ThemeBrowser| -1775221043038|ThemeKitchenSink| -1775221043052|TrackingArea| -1775221043065|UndoRedoWithMenuUpdate| -1775221043079|UserlandNSTest| -1775221043092|layoutEphemeralSubviewTest| -1775221043106|loadDynamicFrameworks| -1775221043119|performKeyEquivalentTest| -1775221043132|predicateWithFormat| -1775221043145|resignFirstResponder-CPControlTextDidEndEditing| -1775221043159|sizeToFitFix| +1775223240559|ArrayController1| +1775223240574|ArrayControllerInitialSelectionTest| +1775223240587|ArrayControllerRemovingFirstTest| +1775223240600|AttachedSheet| +1775223240614|AttachedSheet2| +1775223240627|Bindings| +1775223240641|CGCanvasContext| +1775223240654|CGPath| +1775223240667|CPAlertTest| +1775223240681|CPAnimatablePropertyContainerTest| +1775223240694|CPAnimationContextTest| +1775223240708|CPAnimationTest| +1775223240721|CPBinder-echo-bug| +1775223240734|CPBoxCibTest| +1775223240748|CPBoxTest| +1775223240761|CPBrowserTest| +1775223240775|CPButtonKeyEquivalentDefaultTest| +1775223240788|CPButtonTest| +1775223240802|CPByteCountFormatter| +1775223240815|CPCollectionViewNibTest| +1775223240829|CPColor-CPImage-description| +1775223240842|CPColorWellBindings| +1775223240855|CPComboBoxTest| +1775223240868|CPControlPerformClickExceptionTest| +1775223240882|CPControlSize| +1775223240895|CPCursor| +1775223240908|CPDateFormatterTest| +1775223240922|CPDatePickerTest| +1775223240935|CPDictionaryControllerTest| +1775223240948|CPDocumentControllerTest| +1775223240962|CPFormatterTest| +1775223240975|CPGraphicsTest| +1775223240988|CPImageAndTextViewImageScaling| +1775223241002|CPImageViewAlignmentScaling| +1775223241015|CPImageViewTest| +1775223241029|CPImageViewbindingsTest| +1775223241042|CPLevelIndicator| +1775223241055|CPLocalizationTest| +1775223241069|CPLogTest| +1775223241082|CPMenuCALayerTest| +1775223241095|CPMenuEnabledBindingsTest| +1775223241109|CPMenuKeyEquivalents| +1775223241122|CPMenuRemoveAllTest| +1775223241135|CPMenuSubmenuPlacementConstraints| +1775223241149|CPMenuTest| +1775223241163|CPOutlineViewCibTest| +1775223241176|CPOutlineViewTest| +1775223241190|CPOutlineViewViewBasedCibTest| +1775223241203|CPPanelTest| +1775223241217|CPPlatformWindow| +1775223241230|CPPlattformWindowMinSize| +1775223241244|CPPopUpButtonBindings| +1775223241257|CPPopUpButtonTest| +1775223241270|CPPopover| +1775223241284|CPPredicateEditorCibTest| +1775223241297|CPProgressIndicator| +1775223241311|CPPropertyListSerializationTest| +1775223241324|CPRadioBindings| +1775223241338|CPRuleEditorCibTest| +1775223241351|CPScrollView| +1775223241365|CPScrollView2| +1775223241378|CPSearchField| +1775223241392|CPSearchFieldPredicateBinding| +1775223241405|CPSegmentedControlBindings| +1775223241419|CPSegmentedControlTest| +1775223241432|CPSoundTest| +1775223241446|CPSplitViewDivider| +1775223241459|CPSplitViewTest| +1775223241473|CPStackViewTest| +1775223241487|CPStepperBindings| +1775223241500|CPStepperNibTest| +1775223241514|CPTabView2| +1775223241527|CPTabViewBindings| +1775223241541|CPTabViewNib| +1775223241555|CPTableViewGroupRows| +1775223241568|CPTextField| +1775223241582|CPTextFieldEditingStyleTest| +1775223241595|CPTextFieldHeightTest| +1775223241609|CPTextFieldMovementsTest| +1775223241622|CPTextFieldMultiline| +1775223241636|CPTextView| +1775223241649|CPTextViewCibTest| +1775223241662|CPTextViewDelegateAndNotifications| +1775223241676|CPTimeZone| +1775223241689|CPTokenFieldTest| +1775223241703|CPToolTip| +1775223241717|CPToolbarTest| +1775223241730|CPTreeControllerTest| +1775223241744|CPURLConnectionAsyncTest| +1775223241757|CPURLConnectionSynchronousTest| +1775223241771|CPUserDefaults| +1775223241784|CPUserDefaultsControllerTest| +1775223241798|CPUserNotificationTest| +1775223241811|CPViewController| +1775223241824|CPVisualEffectViewTest| +1775223241838|CPWebViewTest| +1775223241851|CPWebViewTest2| +1775223241865|CPWindowLiveResizeTest| +1775223241878|CPWindowMovableTest| +1775223241892|CPWindowResizeStyle| +1775223241905|ChildWindows| +1775223241919|CompilationTests| +1775223241932|ContinuouslyUpdatesValueBinding| +1775223241946|CopyAndPaste| +1775223241959|CrossOriginTest| +1775223241972|FF4096Test| +1775223241986|FontEnhancementTest| +1775223242000|FontMetricsExplorer| +1775223242014|KeyEquivalents| +1775223242027|KeyViewLoopTest| +1775223242041|KeyWindowInTheBackgroundActivation| +1775223242054|LayoutTest| +1775223242068|LoadTimeTest| +1775223242081|LongBindings| +1775223242095|MobileTest| +1775223242108|MultipleValueBindings| +1775223242121|NSBoxTest| +1775223242135|NSBrowserTest| +1775223242149|NewTextFieldBezel| +1775223242163|Nib2CibAlignment| +1775223242176|Nib2CibBaselineAlignementTest| +1775223242190|Nib2CibSubviewsOrderTest| +1775223242203|NibAppRemixed| +1775223242217|PatternFillTest| +1775223242230|PlatformWindows| +1775223242244|PopUpButtonEscTest| +1775223242257|ScalingTest| +1775223242271|ScalingTest2| +1775223242284|ScrollviewTheming| +1775223242298|SheetWindowOrderFrontIssue| +1775223242311|SimpleBindings2| +1775223242324|SmartFoldersDemo| +1775223242338|TableTest| +1775223242351|ThemeBrowser| +1775223242365|ThemeKitchenSink| +1775223242378|TrackingArea| +1775223242392|UndoRedoWithMenuUpdate| +1775223242405|UserlandNSTest| +1775223242419|layoutEphemeralSubviewTest| +1775223242432|loadDynamicFrameworks| +1775223242446|performKeyEquivalentTest| +1775223242459|predicateWithFormat| +1775223242472|resignFirstResponder-CPControlTextDidEndEditing| +1775223242486|sizeToFitFix|