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.

Sign up for GitHub

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

Jump to bottom

Fix sortedObjects #2130

Merged
merged 4 commits into from
Apr 22, 2015
Merged

Fix sortedObjects #2130

merged 4 commits into from
Apr 22, 2015

Conversation

asturur
Copy link
Member

@asturur asturur commented Apr 20, 2015

Fix sorting of objects in activeGroup.
Wait for screen for comparing

closes #508

@kangax
Copy link
Member

kangax commented Apr 20, 2015

A test would be great here as well

@asturur
Copy link
Member Author

asturur commented Apr 20, 2015

@kangax test done.
I cannot see anymore the test summary at the end of the script. Is this normal?

image

@kangax
Copy link
Member

kangax commented Apr 20, 2015

Strange... but the tests seem to pass. Maybe it's new jshint again.

@sapics
Copy link
Contributor

sapics commented Apr 21, 2015

This is the full version of qunit.html. There are more errors, and, some of them look unexpected.

<!DOCTYPE html>
<html>
<head>
  <meta charset="utf-8">
  <title>fabric.js qunit test</title>
  <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.18.0.css">
</head>
<body>
  <div id="qunit"></div>
  <div id="qunit-fixture"></div>
  <script src="dist/fabric.js"></script>
  <script src="http://code.jquery.com/qunit/qunit-1.18.0.js"></script>
  <script src="test/unit/canvas.js"></script>
  <script src="test/unit/canvas_static.js"></script>
  <script src="test/unit/circle.js"></script>
  <script src="test/unit/color.js"></script>
  <script src="test/unit/ellipse.js"></script>
  <script src="test/unit/gradient.js"></script>
  <script src="test/unit/group.js"></script>
  <script src="test/unit/image_filters.js"></script>
  <script src="test/unit/image.js"></script>
  <script src="test/unit/itext.js"></script>
  <script src="test/unit/line.js"></script>
  <script src="test/unit/object_interactivity.js"></script>
  <script src="test/unit/object.js"></script>
  <script src="test/unit/observable.js"></script>
  <script src="test/unit/parser.js"></script>
  <script src="test/unit/path_group.js"></script>
  <script src="test/unit/path.js"></script>
  <script src="test/unit/pattern.js"></script>
  <script src="test/unit/polygon.js"></script>
  <script src="test/unit/polyline.js"></script>
  <script src="test/unit/rect.js"></script>
  <script src="test/unit/shadow.js"></script>
  <script src="test/unit/text.js"></script>
  <script src="test/unit/util.js"></script>
</body>
</html>

@asturur
Copy link
Member Author

asturur commented Apr 21, 2015

Screens of active group rendering in correct order.

image

image

image

image

@asturur
Copy link
Member Author

asturur commented Apr 21, 2015

@sapics can i have your email? or please drop me an email in the mail of my profile.

@asturur asturur mentioned this pull request Apr 22, 2015
Closed
@asturur
Copy link
Member Author

asturur commented Apr 22, 2015

@kangax cleaned the PR from unrelated comments ( @sapics your qtest unit html was very usefull to me thanks, i forgot it ) and i think this pr is ready for your final check.

kangax added a commit that referenced this pull request Apr 22, 2015
@kangax
Merge pull request #2130 from asturur/ActiveGroupSorter
54211dd 
Fix sortedObjects
@kangax kangax merged commit 54211dd into fabricjs:master Apr 22, 2015
@kangax
Copy link
Member

kangax commented Apr 22, 2015

@asturur could you please update change log as well when you get a chance (I'm on the phone right now)

@asturur
Copy link
Member Author

asturur commented Apr 22, 2015

You can live the changelog always to me, if i don't tell you i disappear for some period.
I prefer you focus on decision to merge what when if.

@asturur asturur deleted the ActiveGroupSorter branch April 24, 2015 12:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

activeGroup object sort is incorrect
3 participants
@asturur @kangax @sapics