Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make ⌥← and ← smarter (show parent folder/hidden files and deal with combined objs). Fixes #1286 #1493

Merged
merged 3 commits into from Jul 12, 2013

Conversation

pjrobertson
Copy link
Member

@pjrobertson pjrobertson commented May 10, 2013

See #1287 for the discussion. This is just a new pull rebased against master

Atm hitting ← will only work for combined file objects. If you have combined say... contact objects then ← will do nothing, but that's up to the handler for 'contact' types to deal with (in 'parentOfObect:`1 so it's not too difficult

1 parentOfObject: may be worth adding it to the plugin dev ref under the 'code' section. And thinking about it, this should be made more clear - the methods here are for the class defined as the 'object handler' in the info.plist

@pjrobertson
Copy link
Member Author

@pjrobertson pjrobertson commented Jun 24, 2013

ping @skurfer - here's the new altParent pull

@skurfer
Copy link
Member

@skurfer skurfer commented Jul 1, 2013

OK, I've convinced myself that the behavior I was complaining about is actually correct, so I was going to merge this, but resolving the conflict is not as easy as I hoped. Things seem to work fine on this branch, but if I merge with master and resolve the conflict just by taking these changes, there's a bug. ⌥← shows hidden files in the selected directory (same as ⌥→) instead of going to the parent.

@pjrobertson
Copy link
Member Author

@pjrobertson pjrobertson commented Jul 4, 2013

OK, tonight I'll try and figure out the merge conflict. Sorry for being slow to respond. Your bug should be pretty easy to fix. Probably a stray brace {} somewhere... :)

@skurfer
Copy link
Member

@skurfer skurfer commented Jul 10, 2013

Did you ever get a chance to look at this?

@pjrobertson
Copy link
Member Author

@pjrobertson pjrobertson commented Jul 10, 2013

Nope, not yet… I'll get on it in the next few days :)

I've been having more fun trying to send as many emails to you as possible ;-)

On 10 Gorff 2013, at 11:10, Rob McBroom notifications@github.com wrote:

Did you ever get a chance to look at this?


Reply to this email directly or view it on GitHub.

@pjrobertson
Copy link
Member Author

@pjrobertson pjrobertson commented Jul 10, 2013

OK, try this. Please do a bit of testing, and also some manual comparisons with the current HEAD. I had to basically do the whole thing from scratch so I don't know if I got it right.

Maybe we should try and merge branches quicker ;-)

I'll hold off from any changes until you've had some time to catch up :) (but take your time, no rush of course)

@skurfer
Copy link
Member

@skurfer skurfer commented Jul 12, 2013

Behavior seems right. I'll give the code a look.

skurfer added a commit that referenced this issue Jul 12, 2013
Make ⌥← and ← smarter (show parent folder/hidden files and deal with combined objs). Fixes #1286
@skurfer skurfer merged commit 490298b into quicksilver:master Jul 12, 2013
@pjrobertson pjrobertson deleted the altParent2 branch Jul 19, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants