Skip to content

Conversation

MatteS75
Copy link
Contributor

@MatteS75 MatteS75 commented Nov 5, 2012

Here's the updated PR for http://bugs.jqueryui.com/ticket/8756

@@ -145,4 +145,24 @@ test("nw", function() {
equal( target.height(), 100, "compare height" );
});

test("handle with complex markup (#8756)", function() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this test should be removed in favor of the other test.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm.. so, to sum up, you two want the resizable complex markup handle test to be a single test that is located in the draggable testsuite? Seems strange to me. Have I missinterpreted?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind, you're right. It just seemed like this test was redundant given the other test, but it can't hurt. Have you also considered one test with reversing the calls to draggable() and sortable()?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this is correct. The resizable test is checking for support of complex markup and the draggable test is checking that resizing is possible while draggable is enabled.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean draggable() vs resizable() (not sortable?)

No, I have not tried that. Now that you mention it, is it because the ui.mouse thing will call the capture methods in another order depending on the order the widgets are initialized? I havnt considered that before...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I meant that last comment for the lines above... look up.

@mikesherov
Copy link
Member

@MatteS75, I think we're good to go once you make those changes. You'll need to rebase as well considering this can't be automatically merged. Thanks again!

…ngle resizable test in the draggable testsuite
@MatteS75
Copy link
Contributor Author

Made that change, now I have to read up on rebasing ;)

@mikesherov
Copy link
Member

Rebasing involves checking out master, pulling down the latest changes from upstream, checking out your branch, and then saying git rebase master. Edit away any conflicts. Then git add the files you've fixed, then git rebase --continue until all commits are rebased. At that point you push your changes back up using git push --force

mikesherov and others added 18 commits November 15, 2012 14:55
…tion - Fixed #8770 Dev: Remove globals and Standardize Test Suite
… #5659 - CSS Framework: Don't show icon when only ui-icon class is present.
…Menu: refresh() doesn't refresh existing submenus.
…rammatically moving focus to track-toolipped-input. Fixes #8747 - Tooltip: Using the track option within dialogs creates JS errors
…ip ever overlapping the trigger. Also fix max-width for custom-content demo. Fixes #8739 - Tooltip: Default positioning on large items off.
…Safari 5.1 when window.location contains a space.
…bug in core. Fixes #8741 - Dialog: dialog with position:fixed goes offscreen when opening after scrolling down since v 1.9.0.
scottgonzalez and others added 24 commits November 15, 2012 14:59
…tribute is not removed from tabs when destroy is called.
… widget. Fixes #8805 - Widget: widgetEventPrefix is incorrect when inheriting with jQuery UI 1.9.1.
…on doesn't remove hover state if they are disabled
…idth and height when only one is changing

Resizable: Trigger resize event only when element is resized. Fixes #5545 - Callbacks ignore the grid.

Resizable: Added event tests. Fixes #5817 - resize event reports unconstrained ui.size
…arRange. Fixes #7362 - Datepicker allows changing year to something outside yearRange
… not hide consistently with dynamically loaded content.
…s while open (we no longer mix events). Fixes #8799 - Tooltip: tracking fails on nested elements.
…ngle resizable test in the draggable testsuite
@mikesherov
Copy link
Member

@MatteS75, looks like you're having a bit of trouble with the rebasing. Perhaps open a new pull request?

@MatteS75
Copy link
Contributor Author

yes, I will. I dont understand why, but the windows github tool started moving all the commits into my branch, and that most certainly was not intentional! Ill have to sort this out, and create a new RP. It can take a while...

@MatteS75
Copy link
Contributor Author

Do you want this still to be its own branch, or, as I understand it, rebase to master and create a new RP from my master?

@mikesherov
Copy link
Member

Still a branch!

@MatteS75 MatteS75 closed this Nov 16, 2012
@MatteS75
Copy link
Contributor Author

Phew, man this is getting messy! Created a new PR, hope I didnt mess up too much...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.