CPRuleEditor & CPPredicateEditor fixes and enhancements #1283
Conversation
|
Warning: i rebased this branch. If it's a problem i can create a new branch/pull request. |
|
@klasspieter would you mind reviewing this? I think you know the rule editor better than anyone else on the core team. |
|
It would probably be helpful if I got his name right :) /cc @klaaspieter |
…uleEditor:displayValueForCriterion:inRow: is more restricive: you must return the same view object for a specific criterion in a given row. In CPRuleEditorCibTest, the delegate has been updated to follow this rule, it also fixes a bug where the predicate was not correctly handling custom control values.
… item you can have different views on the right:
* date is (today, yesterday)
* date is less than [text field]
- CPPredicateEditorCibTest example: templates merging in the 'mixed' criterion.
- ojtest AppKit/CPPredicateEditorTest testing the merging feature.
- Cleaned and rearranged code related to the right control action method.
- re-enable tooltips.
…heck that was causing an exception when keyPath was a compound key path.
CPPredicateEditor test app: bind textfield and editor to a CPObjectController.
…fter a UI interaction to prevent sending unwanted notifications to the binder.
Send action through the responder chain even if target or action is nil. CPControl relies on this to send updates to the binder.
…nitialized by default.
…iew was not updating its frameSize when rows where added/removed. Reported here: https://groups.google.com/d/msg/objectivej/G2MFGGSHaOY/ojcQaoNSpcAJ I also adjusted the plus button right padding to give enough space for the scroller. Edited CPRuleEditorCibTest xib to unhide the vertical scroller.
|
@aljungberg @aparajita @primalmotion @klaaspieter Any objections to merging this? |
|
Go for it. |
|
Seems good. Antoine Mercadal Le 29 déc. 2011 à 09:09, aparajita reply@reply.github.com a écrit :
|
| @@ -1118,7 +1121,8 @@ TODO: implement | |||
| var view = [[_CPRuleEditorViewSliceDropSeparator alloc] initWithFrame:CGRectMake(0,-10, [self frame].size.width, 2)]; | |||
| [view setAutoresizingMask:CPViewWidthSizable]; | |||
| #if PLATFORM(DOM) | |||
| view._DOMElement.style.webkitTransition = "opacity 300ms ease-in"; | |||
| if (CPBrowserIsEngine(CPWebKitBrowserEngine)) | |||
There was a problem hiding this comment.
Should probably use a feature test here instead of a browser test.
|
Looks good although I posted some minor comments above. |
|
|
||
| if (predicate != nil) | ||
| { | ||
| if ((_nestingMode == CPRuleEditorNestingModeSimple || _nestingMode == CPRuleEditorNestingModeCompound) | ||
| && [predicate isKindOfClass:[CPComparisonPredicate class]]) | ||
| predicate = [[CPCompoundPredicate alloc] initWithType:[self _compoundPredicateTypeForRootRows] subpredicates:[CPArray arrayWithObject:predicate]]; | ||
|
|
||
| //TODO: handle CPRuleEditorNestingModeList and CPCompoundPredicate |
There was a problem hiding this comment.
Please make this an issue once the code is merged.
|
Change seems solid. I've added some minor inline notes mostly about cleaning up the code. |
…or fading the drop line separator.
…CPRulePredicateEditor
SmartFoldersDemo: disable the size-to-fit like feature in the controller because 1/ CPPredicateEditor should have its own sizeToFit and 2/ It was shadowing other resizing bugs.
… controller and added initWithCoder methods.
…CPRulePredicateEditor
|
So what ? |
|
I'm not sure what you are referring to. |
|
I meant: So, what is the status of this pull request ? |
|
Still looks good although it no longer merges cleanly. |
|
I'll manually merge it soon. |
…itor Conflicts: AppKit/CPRuleEditor/CPRuleEditor.j
|
Looks like you are working on the merge, should I leave it to you? Can I ask you to please run |
|
Done. capp linted everything and resolved conflicts (at this moment 26.04.12 20:46:00). |
CPRuleEditor & CPPredicateEditor fixes and enhancements
|
Merged, merci bien! |
|
Milestone: Someday. Label: #new. What's next? A reviewer should examine this issue. |
CPRuleEditor's delegate in CPRuleEditorCibTest example: fixes a bug where the predicate was not correctly handling custom control values.
CPPredicateEditor enhancements: templates merging, two-ways binding example between a text field and a predicate editor.