fabric-rails 1.0.12.1 → 1.2.1

data/vendor/assets/javascripts/fabric/pattern.class.js

@@ -1,20 +1,29 @@
 /**
  * Pattern class
- * @class Pattern
- * @memberOf fabric
+ * @class fabric.Pattern
  */
-fabric.Pattern = fabric.util.createClass(/** @scope fabric.Pattern.prototype */ {
+fabric.Pattern = fabric.util.createClass(/** @lends fabric.Pattern.prototype */ {
 
   /**
    * Repeat property of a pattern (one of repeat, repeat-x, repeat-y)
-   * @property
    * @type String
    */
   repeat: 'repeat',
 
+  /**
+   * Pattern horizontal offset from object's left/top corner
+   * @type Number
+   */
+  offsetX: 0,
+
+  /**
+   * Pattern vertical offset from object's left/top corner
+   * @type Number
+   */
+  offsetY: 0,
+
   /**
    * Constructor
-   * @method initialize
    * @param {Object} [options]
    * @return {fabric.Pattern} thisArg
    */
@@ -22,18 +31,38 @@ fabric.Pattern = fabric.util.createClass(/** @scope fabric.Pattern.prototype */
     options || (options = { });
 
     if (options.source) {
-      this.source = typeof options.source === 'string'
-        ? new Function(options.source)
-        : options.source;
+      if (typeof options.source === 'string') {
+        // function string
+        if (typeof fabric.util.getFunctionBody(options.source) !== 'undefined') {
+          this.source = new Function(fabric.util.getFunctionBody(options.source));
+        }
+        else {
+          // img src string
+          var _this = this;
+          this.source = fabric.util.createImage();
+          fabric.util.loadImage(options.source, function(img) {
+            _this.source = img;
+          });
+        }
+      }
+      else {
+        // img element
+        this.source = options.source;
+      }
     }
     if (options.repeat) {
       this.repeat = options.repeat;
     }
+    if (options.offsetX) {
+      this.offsetX = options.offsetX;
+    }
+    if (options.offsetY) {
+      this.offsetY = options.offsetY;
+    }
   },
 
   /**
    * Returns object representation of a pattern
-   * @method toObject
    * @return {Object}
    */
   toObject: function() {
@@ -42,8 +71,7 @@ fabric.Pattern = fabric.util.createClass(/** @scope fabric.Pattern.prototype */
 
     // callback
     if (typeof this.source === 'function') {
-      source = String(this.source)
-                .match(/function\s+\w*\s*\(.*\)\s+\{([\s\S]*)\}/)[1];
+      source = String(this.source);
     }
     // <img> element
     else if (typeof this.source.src === 'string') {
@@ -52,13 +80,14 @@ fabric.Pattern = fabric.util.createClass(/** @scope fabric.Pattern.prototype */
 
     return {
       source: source,
-      repeat: this.repeat
+      repeat: this.repeat,
+      offsetX: this.offsetX,
+      offsetY: this.offsetY
     };
   },
 
   /**
    * Returns an instance of CanvasPattern
-   * @method toLive
    * @param ctx
    * @return {CanvasPattern}
    */
@@ -66,4 +95,4 @@ fabric.Pattern = fabric.util.createClass(/** @scope fabric.Pattern.prototype */
     var source = typeof this.source === 'function' ? this.source() : this.source;
     return ctx.createPattern(source, this.repeat);
   }
-});
+});

data/vendor/assets/javascripts/fabric/point.class.js

@@ -15,37 +15,23 @@
 
   /**
    * Point class
-   * @name Point
-   * @memberOf fabric
+   * @class fabric.Point
    * @constructor
    * @param {Number} x
    * @param {Number} y
    * @return {fabric.Point} thisArg
    */
   function Point(x, y) {
-    if (arguments.length > 0) {
-      this.init(x, y);
-    }
+    this.x = x;
+    this.y = y;
   }
 
-  Point.prototype = /** @scope fabric.Point.prototype */ {
+  Point.prototype = /** @lends fabric.Point.prototype */ {
 
     constructor: Point,
 
-    /**
-     * Constructor
-     * @method init
-     * @param {Number} x left offset
-     * @param {Number} y top offset
-     */
-    init: function (x, y) {
-      this.x = x;
-      this.y = y;
-    },
-
     /**
      * Adds another point to this one and returns another one
-     * @method add
      * @param {fabric.Point} that
      * @return {fabric.Point} new Point instance with added values
      */
@@ -55,7 +41,6 @@
 
     /**
      * Adds another point to this one
-     * @method addEquals
      * @param {fabric.Point} that
      * @return {fabric.Point} thisArg
      */
@@ -67,7 +52,6 @@
 
     /**
      * Adds value to this point and returns a new one
-     * @method scalarAdd
      * @param {Number} scalar
      * @return {fabric.Point} new Point with added value
      */
@@ -77,7 +61,6 @@
 
     /**
      * Adds value to this point
-     * @method scalarAddEquals
      * @param {Number} scalar
      * @param {fabric.Point} thisArg
      */
@@ -89,7 +72,6 @@
 
     /**
      * Subtracts another point from this point and returns a new one
-     * @method subtract
      * @param {fabric.Point} that
      * @return {fabric.Point} new Point object with subtracted values
      */
@@ -99,7 +81,6 @@
 
     /**
      * Subtracts another point from this point
-     * @method subtractEquals
      * @param {fabric.Point} that
      * @return {fabric.Point} thisArg
      */
@@ -111,7 +92,6 @@
 
     /**
      * Subtracts value from this point and returns a new one
-     * @method scalarSubtract
      * @param {Number} scalar
      * @return {fabric.Point}
      */
@@ -121,7 +101,6 @@
 
     /**
      * Subtracts value from this point
-     * @method scalarSubtractEquals
      * @param {Number} scalar
      * @return {fabric.Point} thisArg
      */
@@ -133,7 +112,6 @@
 
     /**
      * Miltiplies this point by a value and returns a new one
-     * @method multiply
      * @param {Number} scalar
      * @return {fabric.Point}
      */
@@ -143,7 +121,6 @@
 
     /**
      * Miltiplies this point by a value
-     * @method multiplyEquals
      * @param {Number} scalar
      * @return {fabric.Point} thisArg
      */
@@ -155,7 +132,6 @@
 
     /**
      * Divides this point by a value and returns a new one
-     * @method divide
      * @param {Number} scalar
      * @return {fabric.Point}
      */
@@ -165,7 +141,6 @@
 
     /**
      * Divides this point by a value
-     * @method divideEquals
      * @param {Number} scalar
      * @return {fabric.Point} thisArg
      */
@@ -177,7 +152,6 @@
 
     /**
      * Returns true if this point is equal to another one
-     * @method eq
      * @param {fabric.Point} that
      * @return {Boolean}
      */
@@ -187,7 +161,6 @@
 
     /**
      * Returns true if this point is less than another one
-     * @method lt
      * @param {fabric.Point} that
      * @return {Boolean}
      */
@@ -197,7 +170,6 @@
 
     /**
      * Returns true if this point is less than or equal to another one
-     * @method lte
      * @param {fabric.Point} that
      * @return {Boolean}
      */
@@ -208,7 +180,6 @@
     /**
 
      * Returns true if this point is greater another one
-     * @method gt
      * @param {fabric.Point} that
      * @return {Boolean}
      */
@@ -218,7 +189,6 @@
 
     /**
      * Returns true if this point is greater than or equal to another one
-     * @method gte
      * @param {fabric.Point} that
      * @return {Boolean}
      */
@@ -228,7 +198,6 @@
 
     /**
      * Returns new point which is the result of linear interpolation with this one and another one
-     * @method lerp
      * @param {fabric.Point} that
      * @param {Number} t
      * @return {fabric.Point}
@@ -239,7 +208,6 @@
 
     /**
      * Returns distance from this point and another one
-     * @method distanceFrom
      * @param {fabric.Point} that
      * @return {Number}
      */
@@ -251,7 +219,6 @@
 
     /**
      * Returns the point between this point and another one
-     * @method midPointFrom
      * @param {fabric.Point} that
      * @return {fabric.Point}
      */
@@ -261,7 +228,6 @@
 
     /**
      * Returns a new point which is the min of this and another one
-     * @method min
      * @param {fabric.Point} that
      * @return {fabric.Point}
      */
@@ -271,7 +237,6 @@
 
     /**
      * Returns a new point which is the max of this and another one
-     * @method max
      * @param {fabric.Point} that
      * @return {fabric.Point}
      */
@@ -281,7 +246,6 @@
 
     /**
      * Returns string representation of this point
-     * @method toString
      * @return {String}
      */
     toString: function () {
@@ -290,7 +254,6 @@
 
     /**
      * Sets x/y of this point
-     * @method setXY
      * @param {Number} x
      * @return {Number} y
      */
@@ -301,7 +264,6 @@
 
     /**
      * Sets x/y of this point from another point
-     * @method setFromPoint
      * @param {fabric.Point} that
      */
     setFromPoint: function (that) {
@@ -311,7 +273,6 @@
 
     /**
      * Swaps x/y of this point and another point
-     * @method setFromPoint
      * @param {fabric.Point} that
      */
     swap: function (that) {

data/vendor/assets/javascripts/fabric/shadow.class.js

@@ -1,41 +1,41 @@
 /**
  * Shadow class
- * @class Shadow
- * @memberOf fabric
+ * @class fabric.Shadow
  */
-fabric.Shadow = fabric.util.createClass(/** @scope fabric.Shadow.prototype */ {
+fabric.Shadow = fabric.util.createClass(/** @lends fabric.Shadow.prototype */ {
 
   /**
    * Shadow color
-   * @property
    * @type String
    */
   color: 'rgb(0,0,0)',
 
   /**
    * Shadow blur
-   * @property
    * @type Number
    */
   blur: 0,
 
   /**
    * Shadow horizontal offset
-   * @property
    * @type Number
    */
   offsetX: 0,
 
   /**
    * Shadow vertical offset
-   * @property
    * @type Number
    */
   offsetY: 0,
 
+  /**
+   * Whether the shadow should affect stroke operations
+   * @type Boolean
+   */
+  affectStroke: false,
+
   /**
    * Constructor
-   * @method initialize
    * @param [options] Options object with any of color, blur, offsetX, offsetX properties
    * @return {fabric.Shadow} thisArg
    */
@@ -45,9 +45,18 @@ fabric.Shadow = fabric.util.createClass(/** @scope fabric.Shadow.prototype */ {
     }
   },
 
+  /* _TO_SVG_START_ */
+  /**
+   * Returns SVG representation of a shadow
+   * @return {String}
+   */
+  toSVG: function() {
+
+  },
+  /* _TO_SVG_END_ */
+
   /**
    * Returns object representation of a shadow
-   * @method toObject
    * @return {Object}
    */
   toObject: function() {
@@ -57,14 +66,5 @@ fabric.Shadow = fabric.util.createClass(/** @scope fabric.Shadow.prototype */ {
       offsetX: this.offsetX,
       offsetY: this.offsetY
     };
-  },
-
-  /**
-   * Returns SVG representation of a shadow
-   * @method toSVG
-   * @return {String}
-   */
-  toSVG: function() {
-
   }
-});
+});

data/vendor/assets/javascripts/fabric/{circle.class.js → shapes/circle.class.js}

@@ -13,21 +13,20 @@
 
   /**
    * Circle class
-   * @class Circle
+   * @class fabric.Circle
    * @extends fabric.Object
    */
-  fabric.Circle = fabric.util.createClass(fabric.Object, /** @scope fabric.Circle.prototype */ {
+  fabric.Circle = fabric.util.createClass(fabric.Object, /** @lends fabric.Circle.prototype */ {
 
     /**
      * Type of an object
-     * @property
      * @type String
+     * @default
      */
     type: 'circle',
 
     /**
      * Constructor
-     * @method initialize
      * @param {Object} [options] Options object
      * @return {fabric.Circle} thisArg
      */
@@ -43,7 +42,6 @@
 
     /**
      * Returns object representation of an instance
-     * @method toObject
      * @param {Array} propertiesToInclude
      * @return {Object} object representation of an instance
      */
@@ -53,23 +51,36 @@
       });
     },
 
+    /* _TO_SVG_START_ */
     /**
      * Returns svg representation of an instance
-     * @method toSVG
      * @return {String} svg representation of an instance
      */
     toSVG: function() {
-      return ('<circle ' +
-        'cx="0" cy="0" ' +
-        'r="' + this.radius + '" ' +
-        'style="' + this.getSvgStyles() + '" ' +
-        'transform="' + this.getSvgTransform() + '" ' +
-        '/>');
+      var markup = [];
+
+      if (this.fill && this.fill.toLive) {
+        markup.push(this.fill.toSVG(this, false));
+      }
+      if (this.stroke && this.stroke.toLive) {
+        markup.push(this.stroke.toSVG(this, false));
+      }
+
+      markup.push(
+        '<circle ',
+          'cx="0" cy="0" ',
+          'r="', this.radius,
+          '" style="', this.getSvgStyles(),
+          '" transform="', this.getSvgTransform(),
+        '"/>'
+      );
+
+      return markup.join('');
     },
+    /* _TO_SVG_END_ */
 
     /**
      * @private
-     * @method _render
      * @param ctx {CanvasRenderingContext2D} context to render on
      */
     _render: function(ctx, noTransform) {
@@ -78,18 +89,13 @@
       ctx.globalAlpha = this.group ? (ctx.globalAlpha * this.opacity) : this.opacity;
       ctx.arc(noTransform ? this.left : 0, noTransform ? this.top : 0, this.radius, 0, piBy2, false);
       ctx.closePath();
-      if (this.fill) {
-        ctx.fill();
-      }
-      this._removeShadow(ctx);
-      if (this.stroke) {
-        ctx.stroke();
-      }
+
+      this._renderFill(ctx);
+      this._renderStroke(ctx);
     },
 
     /**
      * Returns horizontal radius of an object (according to how an object is scaled)
-     * @method getRadiusX
      * @return {Number}
      */
     getRadiusX: function() {
@@ -98,7 +104,6 @@
 
     /**
      * Returns vertical radius of an object (according to how an object is scaled)
-     * @method getRadiusY
      * @return {Number}
      */
     getRadiusY: function() {
@@ -107,7 +112,6 @@
 
     /**
      * Sets radius of an object (and updates width accordingly)
-     * @method setRadius
      * @return {Number}
      */
     setRadius: function(value) {
@@ -117,7 +121,6 @@
 
     /**
      * Returns complexity of an instance
-     * @method complexity
      * @return {Number} complexity of this instance
      */
     complexity: function() {
@@ -125,21 +128,21 @@
     }
   });
 
+  /* _FROM_SVG_START_ */
   /**
    * List of attribute names to account for when parsing SVG element (used by {@link fabric.Circle.fromElement})
    * @static
    * @see: http://www.w3.org/TR/SVG/shapes.html#CircleElement
    */
-  fabric.Circle.ATTRIBUTE_NAMES = 'cx cy r fill fill-opacity opacity stroke stroke-width transform'.split(' ');
+  fabric.Circle.ATTRIBUTE_NAMES = fabric.SHARED_ATTRIBUTES.concat('cx cy r'.split(' '));
 
   /**
    * Returns {@link fabric.Circle} instance from an SVG element
    * @static
-   * @method fabric.Circle.fromElement
    * @param {SVGElement} element Element to parse
    * @param {Object} [options] Options object
    * @throws {Error} If value of `r` attribute is missing or invalid
-   * @return {Object} Instance of fabric.Circle
+   * @return {fabric.Circle} Instance of fabric.Circle
    */
   fabric.Circle.fromElement = function(element, options) {
     options || (options = { });
@@ -167,11 +170,11 @@
   function isValidRadius(attributes) {
     return (('radius' in attributes) && (attributes.radius > 0));
   }
+  /* _FROM_SVG_END_ */
 
   /**
    * Returns {@link fabric.Circle} instance from an object representation
    * @static
-   * @method fabric.Circle.fromObject
    * @param {Object} object Object to create an instance from
    * @return {Object} Instance of fabric.Circle
    */
@@ -179,4 +182,4 @@
     return new fabric.Circle(object);
   };
 
-})(typeof exports !== 'undefined' ? exports : this);
+})(typeof exports !== 'undefined' ? exports : this);