fabric-rails 0.0.5 → 0.0.6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.6 (27 August 2012)
+
+  - fabric.js version 0.9.3
+
 ## 0.0.5 (24 August 2012)
 
   - fabric.js version 0.9.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fabric-rails (0.0.5)
+    fabric-rails (0.0.6)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
 

data/README.md

@@ -4,7 +4,7 @@
 
 This gem provides:
 
-  * fabric.js 0.9.2
+  * fabric.js 0.9.3
 
 ## Installation
 

data/lib/fabric/rails/version.rb

@@ -1,6 +1,6 @@
 module Fabric
   module Rails
-    VERSION = "0.0.5"
-    FABRIC_VERSION = "0.9.2"
+    VERSION = "0.0.6"
+    FABRIC_VERSION = "0.9.3"
   end
 end

data/vendor/assets/javascripts/fabric.js

@@ -1,7 +1,7 @@
 /* build: `node build.js modules=ALL` */
 /*! Fabric.js Copyright 2008-2012, Printio (Juriy Zaytsev, Maxim Chernyak) */
 
-var fabric = fabric || { version: "0.9.2" };
+var fabric = fabric || { version: "0.9.3" };
 
 if (typeof exports != 'undefined') {
   exports.fabric = fabric;
@@ -4224,12 +4224,12 @@ fabric.util.string = {
 
     for (var i = linearGradientEls.length; i--; ) {
       el = linearGradientEls[i];
-      gradientDefs[el.id] = el;
+      gradientDefs[el.getAttribute('id')] = el;
     }
 
     for (var i = radialGradientEls.length; i--; ) {
       el = radialGradientEls[i];
-      gradientDefs[el.id] = el;
+      gradientDefs[el.getAttribute('id')] = el;
     }
 
     return gradientDefs;
@@ -7985,8 +7985,8 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
      */
     setCoords: function() {
 
-      this.currentWidth = this.width * this.scaleX;
-      this.currentHeight = this.height * this.scaleY;
+      this.currentWidth = (this.width + this.strokeWidth) * this.scaleX;
+      this.currentHeight = (this.height + this.strokeWidth) * this.scaleY;
 
       this._hypotenuse = Math.sqrt(
         Math.pow(this.currentWidth / 2, 2) +
@@ -8097,8 +8097,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
     drawBorders: function(ctx) {
       if (!this.hasBorders) return;
 
-      var padding = this.padding,
-          padding2 = padding * 2;
+      var padding2 = this.padding * 2;
 
       ctx.save();
 
@@ -8116,10 +8115,10 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
           h = this.getHeight();
 
       ctx.strokeRect(
-        ~~(-(w / 2) - padding) + 0.5, // offset needed to make lines look sharper
-        ~~(-(h / 2) - padding) + 0.5,
-        ~~(w + padding2),
-        ~~(h + padding2)
+        ~~(-(w / 2) - this.padding - this.strokeWidth / 2 * this.scaleX) + 0.5, // offset needed to make lines look sharper
+        ~~(-(h / 2) - this.padding - this.strokeWidth / 2 * this.scaleY) + 0.5,
+        ~~(w + padding2 + this.strokeWidth * this.scaleX),
+        ~~(h + padding2 + this.strokeWidth * this.scaleY)
       );
 
       if (this.hasRotatingPoint && !this.hideCorners && !this.lockRotation) {
@@ -8208,6 +8207,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
 
       var size = this.cornersize,
           size2 = size / 2,
+          strokeWidth2 = this.strokeWidth / 2,
           padding = this.padding,
           left = -(this.width / 2),
           top = -(this.height / 2),
@@ -8227,42 +8227,42 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
       ctx.fillStyle = this.cornerColor;
 
       // top-left
-      _left = left - scaleOffsetX;
-      _top = top - scaleOffsetY;
+      _left = left - scaleOffsetX - strokeWidth2;
+      _top = top - scaleOffsetY - strokeWidth2;
       ctx.fillRect(_left, _top, sizeX, sizeY);
 
       // top-right
-      _left = left + this.width - scaleOffsetX;
-      _top = top - scaleOffsetY;
+      _left = left + this.width - scaleOffsetX + strokeWidth2;
+      _top = top - scaleOffsetY - strokeWidth2;
       ctx.fillRect(_left, _top, sizeX, sizeY);
 
       // bottom-left
-      _left = left - scaleOffsetX;
-      _top = top + height + scaleOffsetSizeY;
+      _left = left - scaleOffsetX - strokeWidth2;
+      _top = top + height + scaleOffsetSizeY + strokeWidth2;
       ctx.fillRect(_left, _top, sizeX, sizeY);
 
       // bottom-right
-      _left = left + this.width + scaleOffsetSizeX;
-      _top = top + height + scaleOffsetSizeY;
+      _left = left + this.width + scaleOffsetSizeX + strokeWidth2;
+      _top = top + height + scaleOffsetSizeY + strokeWidth2;
       ctx.fillRect(_left, _top, sizeX, sizeY);
 
       // middle-top
       _left = left + this.width/2 - scaleOffsetX;
-      _top = top - scaleOffsetY;
+      _top = top - scaleOffsetY - strokeWidth2;
       ctx.fillRect(_left, _top, sizeX, sizeY);
 
       // middle-bottom
       _left = left + this.width/2 - scaleOffsetX;
-      _top = top + height + scaleOffsetSizeY;
+      _top = top + height + scaleOffsetSizeY + strokeWidth2;
       ctx.fillRect(_left, _top, sizeX, sizeY);
 
       // middle-right
-      _left = left + this.width + scaleOffsetSizeX;
+      _left = left + this.width + scaleOffsetSizeX + strokeWidth2;
       _top = top + height/2 - scaleOffsetY;
       ctx.fillRect(_left, _top, sizeX, sizeY);
 
       // middle-left
-      _left = left - scaleOffsetX;
+      _left = left - scaleOffsetX - strokeWidth2;
       _top = top + height/2 - scaleOffsetY;
       ctx.fillRect(_left, _top, sizeX, sizeY);
 
@@ -8280,8 +8280,8 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
         _left = left + this.width/2 - scaleOffsetX;
 
         _top = this.flipY ?
-          (top + height + (this.rotatingPointOffset / this.scaleY) - sizeY/2)
-          : (top - (this.rotatingPointOffset / this.scaleY) - sizeY/2);
+          (top + height + (this.rotatingPointOffset / this.scaleY) - sizeY/2 - strokeWidth2)
+          : (top - (this.rotatingPointOffset / this.scaleY) - sizeY/2 - strokeWidth2);
 
         ctx.fillRect(_left, _top, sizeX, sizeY);
       }
@@ -10633,7 +10633,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
             ctx.closePath();
             break;
         }
-    previous = current
+        previous = current;
       }
     },
 
@@ -10852,7 +10852,8 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
       var minX = min(aX),
           minY = min(aY),
           deltaX = 0,
-          deltaY = 0;
+          deltaY = 0,
+          strokeWidthOffset = this.strokeWidth > 1 ? (this.strokeWidth * 2) : 0;
 
       var o = {
         top: minY - deltaY,
@@ -10861,8 +10862,8 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
         right: max(aX) - deltaX
       };
 
-      o.width = o.right - o.left;
-      o.height = o.bottom - o.top;
+      o.width = o.right - o.left + strokeWidthOffset;
+      o.height = o.bottom - o.top + strokeWidthOffset;
 
       return o;
     }
@@ -11753,6 +11754,11 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
      */
     render: function(ctx, noTransform) {
       ctx.save();
+      var m = this.transformMatrix;
+      this._resetWidthHeight();
+      if (m) {
+        ctx.transform(m[0], m[1], m[2], m[3], m[4], m[5]);
+      }
       if (!noTransform) {
         this.transform(ctx);
       }
@@ -13605,4 +13611,4 @@ fabric.Image.filters.Tint.fromObject = function(object) {
     fabric.Canvas.prototype.setHeight = fabric.StaticCanvas.prototype.setHeight;
   }
 
-})();
+})();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fabric-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -84,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2353685692121536274
+      hash: -240717121770573638
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: