Permalink
Browse files

Merge branch 'master' into 3.x

Conflicts:
	build/charts-base/charts-base-min.js
  • Loading branch information...
2 parents 42b2e7c + be13cdf commit 950146759f8fe68569e5e30b157df4a2514d6c4f @ericf ericf committed Sep 11, 2012

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -2778,7 +2778,7 @@ Y.Axis = Y.Base.create("axis", Y.Widget, [Y.Renderer], {
{
matrix.translate(x, y);
matrix.rotate(rot);
- Y_DOM.setStyle(label, (transformOrigin[0] * 100) + "% " + (transformOrigin[1] * 100) + "%");
+ Y_DOM.setStyle(label, "transformOrigin", (transformOrigin[0] * 100) + "% " + (transformOrigin[1] * 100) + "%");
Y_DOM.setStyle(label, "transform", matrix.toCSSText());
}
else

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -2778,7 +2778,7 @@ Y.Axis = Y.Base.create("axis", Y.Widget, [Y.Renderer], {
{
matrix.translate(x, y);
matrix.rotate(rot);
- Y_DOM.setStyle(label, (transformOrigin[0] * 100) + "% " + (transformOrigin[1] * 100) + "%");
+ Y_DOM.setStyle(label, "transformOrigin", (transformOrigin[0] * 100) + "% " + (transformOrigin[1] * 100) + "%");
Y_DOM.setStyle(label, "transform", matrix.toCSSText());
}
else
@@ -820,19 +820,26 @@ Y.User = Y.Base.create('user', Y.Model, [Y.ModelSync.REST], {
root: '/users'
});
-var currentUser, newUser;
+var existingUser = new Y.User({id: '1'}),
+ oldUser = new Y.User({id: '2'}),
+ newUser = new Y.User({name: 'Eric Ferraiuolo'});
-// GET the user data from: "/users/123"
-currentUser = new Y.User({id: '123'}).load();
+// GET the existing user data from: "/users/1"
+existingUser.load(function () {
+ Y.log(existingUser.get('name')); // => "Ron Swannson"
-// PUT the updated user data at: "/users/123"
-currentUser.set('name', 'Ron Swanson').save();
+ // Correct the user's `name` and PUT the updated user at: "/users/1"
+ existingUser.set('name', 'Ron Swanson').save();
+});
-// DELETE the user data at: "/users/123"
-currentUser.destroy({remove: true});
+// DELETE the old user data at: "/users/2"
+oldUser.destroy({remove: true});
// POST the new user data to: "/users"
-newUser = new Y.User({name: 'Eric Ferraiuolo'}).save();
+newUser.save(function () {
+ // The server can return the user data with an `id` assigned.
+ Y.log(newUser.get('id')); // => "3"
+});
```
<p>
@@ -865,7 +872,7 @@ var users = new Y.Users();
users.load(function () {
var firstUser = users.item(0);
- firstUser.get('id'); // => "1"
+ Y.log(firstUser.get('id')); // => "1"
// PUT updated user data at: "/users/1"
firstUser.set('name', 'Eric').save();
View
@@ -1,6 +1,11 @@
Charts Change History
=====================
+3.7.0
+-----
+
+ * #2532713 Addressed issue in which updating the dataProvider on a chart with a legend threw an error.
+
3.6.0
-----
View
@@ -864,7 +864,7 @@ Y.Axis = Y.Base.create("axis", Y.Widget, [Y.Renderer], {
{
matrix.translate(x, y);
matrix.rotate(rot);
- Y_DOM.setStyle(label, (transformOrigin[0] * 100) + "% " + (transformOrigin[1] * 100) + "%");
+ Y_DOM.setStyle(label, "transformOrigin", (transformOrigin[0] * 100) + "% " + (transformOrigin[1] * 100) + "%");
Y_DOM.setStyle(label, "transform", matrix.toCSSText());
}
else
View
@@ -1,6 +1,16 @@
Graphics Change History
=======================
+3.7.0
+-----
+
+ * #2532682 Addressed issue in which drawing and filling the same shape independently resulted in bad VML rendering.
+ * #2531432 Added data attribute to allow for passing svg path strings to a shape.
+ * #2532495 Added generic (non-implementation specific) class names to shapes.
+ * #2532611 Added toFront and toBack methods to shapes.
+ * #2532612 Added ability to animate a shapes stroke and fill attributes when incuding the anim-shape submodule. All shape attributes are animatable.
+ * #2532635 Added ability size the contents of a Graphic instance to fit into its parent container.
+
3.6.0
-----
View
@@ -1,6 +1,11 @@
Matrix Change History
=====================
+3.7.0
+-----
+
+ * #2532709 Firefox 16 no longer supports units for tx/ty of a transform matrix. Updated toCSSText() method to no longer add them for Firefox browsers.
+
3.6.0
-----

0 comments on commit 9501467

Please sign in to comment.