fabric-rails 1.0.12.1 → 1.2.1

data/vendor/assets/javascripts/fabric/util/anim_ease.js

@@ -2,7 +2,6 @@
 
   /**
    * Quadratic easing in
-   * @method easeInQuad
    * @memberOf fabric.util.ease
    */
   function easeInQuad(t, b, c, d) {
@@ -11,7 +10,6 @@
 
   /**
    * Quadratic easing out
-   * @method easeOutQuad
    * @memberOf fabric.util.ease
    */
   function easeOutQuad(t, b, c, d) {
@@ -20,7 +18,6 @@
 
   /**
    * Quadratic easing in and out
-   * @method easeInOutQuad
    * @memberOf fabric.util.ease
    */
   function easeInOutQuad(t, b, c, d) {
@@ -31,7 +28,6 @@
 
   /**
    * Cubic easing in
-   * @method easeInCubic
    * @memberOf fabric.util.ease
    */
   function easeInCubic(t, b, c, d) {
@@ -40,7 +36,6 @@
 
   /**
    * Cubic easing out
-   * @method easeOutCubic
    * @memberOf fabric.util.ease
    */
   function easeOutCubic(t, b, c, d) {
@@ -49,7 +44,6 @@
 
   /**
    * Cubic easing in and out
-   * @method easeInOutCubic
    * @memberOf fabric.util.ease
    */
   function easeInOutCubic(t, b, c, d) {
@@ -60,7 +54,6 @@
 
   /**
    * Quartic easing in
-   * @method easeInQuart
    * @memberOf fabric.util.ease
    */
   function easeInQuart(t, b, c, d) {
@@ -69,7 +62,6 @@
 
   /**
    * Quartic easing out
-   * @method easeOutQuart
    * @memberOf fabric.util.ease
    */
   function easeOutQuart(t, b, c, d) {
@@ -78,7 +70,6 @@
 
   /**
    * Quartic easing in and out
-   * @method easeInOutQuart
    * @memberOf fabric.util.ease
    */
   function easeInOutQuart(t, b, c, d) {
@@ -89,7 +80,6 @@
 
   /**
    * Quintic easing in
-   * @method easeInQuint
    * @memberOf fabric.util.ease
    */
   function easeInQuint(t, b, c, d) {
@@ -98,7 +88,6 @@
 
   /**
    * Quintic easing out
-   * @method easeOutQuint
    * @memberOf fabric.util.ease
    */
   function easeOutQuint(t, b, c, d) {
@@ -107,7 +96,6 @@
 
   /**
    * Quintic easing in and out
-   * @method easeInOutQuint
    * @memberOf fabric.util.ease
    */
   function easeInOutQuint(t, b, c, d) {
@@ -118,7 +106,6 @@
 
   /**
    * Sinusoidal easing in
-   * @method easeInSine
    * @memberOf fabric.util.ease
    */
   function easeInSine(t, b, c, d) {
@@ -127,7 +114,6 @@
 
   /**
    * Sinusoidal easing out
-   * @method easeOutSine
    * @memberOf fabric.util.ease
    */
   function easeOutSine(t, b, c, d) {
@@ -136,7 +122,6 @@
 
   /**
    * Sinusoidal easing in and out
-   * @method easeInOutSine
    * @memberOf fabric.util.ease
    */
   function easeInOutSine(t, b, c, d) {
@@ -145,7 +130,6 @@
 
   /**
    * Exponential easing in
-   * @method easeInExpo
    * @memberOf fabric.util.ease
    */
   function easeInExpo(t, b, c, d) {
@@ -154,7 +138,6 @@
 
   /**
    * Exponential easing out
-   * @method easeOutExpo
    * @memberOf fabric.util.ease
    */
   function easeOutExpo(t, b, c, d) {
@@ -163,7 +146,6 @@
 
   /**
    * Exponential easing in and out
-   * @method easeInOutExpo
    * @memberOf fabric.util.ease
    */
   function easeInOutExpo(t, b, c, d) {
@@ -176,7 +158,6 @@
 
   /**
    * Circular easing in
-   * @method easeInCirc
    * @memberOf fabric.util.ease
    */
   function easeInCirc(t, b, c, d) {
@@ -185,7 +166,6 @@
 
   /**
    * Circular easing out
-   * @method easeOutCirc
    * @memberOf fabric.util.ease
    */
   function easeOutCirc(t, b, c, d) {
@@ -194,7 +174,6 @@
 
   /**
    * Circular easing in and out
-   * @method easeInOutCirc
    * @memberOf fabric.util.ease
    */
   function easeInOutCirc(t, b, c, d) {
@@ -205,7 +184,6 @@
 
   /**
    * Elastic easing in
-   * @method easeInElastic
    * @memberOf fabric.util.ease
    */
   function easeInElastic(t, b, c, d) {
@@ -221,7 +199,6 @@
 
   /**
    * Elastic easing out
-   * @method easeOutElastic
    * @memberOf fabric.util.ease
    */
   function easeOutElastic(t, b, c, d) {
@@ -237,7 +214,6 @@
 
   /**
    * Elastic easing in and out
-   * @method easeInOutElastic
    * @memberOf fabric.util.ease
    */
   function easeInOutElastic(t, b, c, d) {
@@ -254,7 +230,6 @@
 
   /**
    * Backwards easing in
-   * @method easeInBack
    * @memberOf fabric.util.ease
    */
   function easeInBack(t, b, c, d, s) {
@@ -264,7 +239,6 @@
 
   /**
    * Backwards easing out
-   * @method easeOutBack
    * @memberOf fabric.util.ease
    */
   function easeOutBack(t, b, c, d, s) {
@@ -274,7 +248,6 @@
 
   /**
    * Backwards easing in and out
-   * @method easeInOutBack
    * @memberOf fabric.util.ease
    */
   function easeInOutBack(t, b, c, d, s) {
@@ -286,7 +259,6 @@
 
   /**
    * Bouncing easing in
-   * @method easeInBounce
    * @memberOf fabric.util.ease
    */
   function easeInBounce(t, b, c, d) {
@@ -295,7 +267,6 @@
 
   /**
    * Bouncing easing out
-   * @method easeOutBounce
    * @memberOf fabric.util.ease
    */
   function easeOutBounce(t, b, c, d) {
@@ -312,7 +283,6 @@
 
   /**
    * Bouncing easing in and out
-   * @method easeInOutBounce
    * @memberOf fabric.util.ease
    */
   function easeInOutBounce(t, b, c, d) {
@@ -321,6 +291,7 @@
   }
 
   /**
+   * Easing functions
    * See <a href="http://gizma.com/easing/">Easing Equations by Robert Penner</a>
    * @namespace fabric.util.ease
    */
@@ -357,4 +328,4 @@
     easeInOutBounce: easeInOutBounce
   };
 
-}());
+}());

data/vendor/assets/javascripts/fabric/util/dom_event.js

@@ -169,7 +169,6 @@
 
   /**
    * Cross-browser wrapper for getting event's coordinates
-   * @method getPointer
    * @memberOf fabric.util
    * @param {Event} event
    * @param {HTMLCanvasElement} upperCanvasEl <canvas> element on which object selection is drawn
@@ -188,13 +187,18 @@
     while (element && element.parentNode && !firstFixedAncestor) {
       element = element.parentNode;
 
-      if (element !== fabric.document && fabric.util.getElementPosition(element) === 'fixed') firstFixedAncestor = element;
+      if (element !== fabric.document &&
+          fabric.util.getElementStyle(element, 'position') === 'fixed') {
+        firstFixedAncestor = element;
+      }
 
-      if (element !== fabric.document && orgElement !== upperCanvasEl && fabric.util.getElementPosition(element) === 'absolute') {
+      if (element !== fabric.document &&
+          orgElement !== upperCanvasEl &&
+          fabric.util.getElementStyle(element, 'position') === 'absolute') {
         scrollLeft = 0;
         scrollTop = 0;
       }
-      else if (element === fabric.document && orgElement !== upperCanvasEl) {
+      else if (element === fabric.document) {
         scrollLeft = body.scrollLeft || docElement.scrollLeft || 0;
         scrollTop = body.scrollTop ||  docElement.scrollTop || 0;
       }
@@ -223,10 +227,20 @@
 
   if (fabric.isTouchSupported) {
     pointerX = function(event) {
-      return (event.touches && event.touches[0] ? (event.touches[0].pageX - (event.touches[0].pageX - event.touches[0].clientX)) || event.clientX : event.clientX);
+      if (event.type !== 'touchend') {
+        return (event.touches && event.touches[0] ?
+          (event.touches[0].pageX - (event.touches[0].pageX - event.touches[0].clientX)) || event.clientX : event.clientX);
+      }
+      return (event.changedTouches && event.changedTouches[0]
+        ? (event.changedTouches[0].pageX - (event.changedTouches[0].pageX - event.changedTouches[0].clientX)) || event.clientX : event.clientX);
     };
     pointerY = function(event) {
-      return (event.touches && event.touches[0] ? (event.touches[0].pageY - (event.touches[0].pageY - event.touches[0].clientY)) || event.clientY : event.clientY);
+      if (event.type !== 'touchend') {
+        return (event.touches && event.touches[0]
+          ? (event.touches[0].pageY - (event.touches[0].pageY - event.touches[0].clientY)) || event.clientY : event.clientY);
+      }
+      return (event.changedTouches && event.changedTouches[0]
+        ? (event.changedTouches[0].pageY - (event.changedTouches[0].pageY - event.changedTouches[0].clientY)) || event.clientY : event.clientY);
     };
   }
 
@@ -234,4 +248,4 @@
 
   fabric.util.object.extend(fabric.util, fabric.Observable);
 
-})();
+})();

data/vendor/assets/javascripts/fabric/util/dom_misc.js

@@ -4,7 +4,6 @@
 
   /**
    * Takes id and returns an element with that id (if one exists in a document)
-   * @method getById
    * @memberOf fabric.util
    * @param {String|HTMLElement} id
    * @return {HTMLElement|null}
@@ -15,7 +14,6 @@
 
   /**
    * Converts an array-like object (e.g. arguments or NodeList) to an array
-   * @method toArray
    * @memberOf fabric.util
    * @param {Object} arrayLike
    * @return {Array}
@@ -42,7 +40,6 @@
 
   /**
    * Creates specified element with specified attributes
-   * @method makeElement
    * @memberOf fabric.util
    * @param {String} tagName Type of an element to create
    * @param {Object} [attributes] Attributes to set on an element
@@ -66,7 +63,6 @@
 
   /**
    * Adds class to an element
-   * @method addClass
    * @memberOf fabric.util
    * @param {HTMLElement} element Element to add class to
    * @param {String} className Class to add to an element
@@ -79,7 +75,6 @@
 
   /**
    * Wraps element with another element
-   * @method wrapElement
    * @memberOf fabric.util
    * @param {HTMLElement} element Element to wrap
    * @param {HTMLElement|String} wrapper Element to wrap with
@@ -99,45 +94,66 @@
 
   /**
    * Returns offset for a given element
-   * @method getElementOffset
    * @function
    * @memberOf fabric.util
    * @param {HTMLElement} element Element to get offset for
    * @return {Object} Object with "left" and "top" properties
    */
   function getElementOffset(element) {
-    // TODO (kangax): need to fix this method
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
+    var docElem, win,
+        box = {left: 0, top: 0},
+        doc = element && element.ownerDocument,
+        offset = {left: 0, top: 0},
+        offsetAttributes = {
+           'borderLeftWidth': 'left',
+           'borderTopWidth':  'top',
+           'paddingLeft':     'left',
+           'paddingTop':      'top'
+        };
+
+    if (!doc){
+      return {left: 0, top: 0};
     }
-    while (element);
-    return ({ left: valueL, top: valueT });
+
+    for (var attr in offsetAttributes) {
+      offset[offsetAttributes[attr]] += parseInt(getElementStyle(element, attr), 10) || 0;
+    }
+
+    docElem = doc.documentElement;
+    if ( typeof element.getBoundingClientRect !== "undefined" ) {
+      box = element.getBoundingClientRect();
+    }
+    if(doc != null && doc === doc.window){
+      win = doc;
+    } else {
+      win = doc.nodeType === 9 && (doc.defaultView || doc.parentWindow);
+    }
+    return {
+      left: box.left + (win.pageXOffset || docElem.scrollLeft) - (docElem.clientLeft || 0) + offset.left,
+      top: box.top + (win.pageYOffset || docElem.scrollTop) - (docElem.clientTop || 0)  + offset.top
+    };
   }
 
   /**
-  * Returns position of a given element
-  * @method getElementPosition
-  * @function
+  * Returns style attribute value of a given element
   * @memberOf fabric.util
-  * @param {HTMLElement} element Element to get offset for
-  * @return {Object} position of the given element.
+  * @param {HTMLElement} element Element to get style attribute for
+  * @param {String} attr Style attribute to get for element
+  * @return {String} Style attribute value of the given element.
   */
-  var getElementPosition;
-  if (fabric.document.defaultView && fabric.document.defaultView.getComputedStyle) {
-    getElementPosition = function (element) {
-      return fabric.document.defaultView.getComputedStyle(element, null).position;
-    };
-  }
-  else {
-    /** @ignore */
-    getElementPosition = function (element) {
-      var value = element.style.position;
-      if (!value && element.currentStyle) value = element.currentStyle.position;
+  function getElementStyle(element, attr) {
+    if (!element.style) {
+      element.style = { };
+    }
+
+    if (fabric.document.defaultView && fabric.document.defaultView.getComputedStyle) {
+      return fabric.document.defaultView.getComputedStyle(element, null)[attr];
+    }
+    else {
+      var value = element.style[attr];
+      if (!value && element.currentStyle) value = element.currentStyle[attr];
       return value;
-    };
+    }
   }
 
   (function () {
@@ -155,7 +171,6 @@
 
     /**
      * Makes element unselectable
-     * @method makeElementUnselectable
      * @memberOf fabric.util
      * @param {HTMLElement} element Element to make unselectable
      * @return {HTMLElement} Element that was passed in
@@ -175,7 +190,6 @@
 
     /**
      * Makes element selectable
-     * @method makeElementSelectable
      * @memberOf fabric.util
      * @param {HTMLElement} element Element to make selectable
      * @return {HTMLElement} Element that was passed in
@@ -201,7 +215,6 @@
 
     /**
      * Inserts a script element with a given url into a document; invokes callback, when that script is finished loading
-     * @method getScript
      * @memberOf fabric.util
      * @param {String} url URL of a script to load
      * @param {Function} callback Callback to execute when script is finished loading
@@ -211,9 +224,6 @@
           scriptEl = fabric.document.createElement('script'),
           loading = true;
 
-      scriptEl.type = 'text/javascript';
-      scriptEl.setAttribute('runat', 'server');
-
       /** @ignore */
       scriptEl.onload = /** @ignore */ scriptEl.onreadystatechange = function(e) {
         if (loading) {
@@ -240,6 +250,6 @@
   fabric.util.addClass = addClass;
   fabric.util.wrapElement = wrapElement;
   fabric.util.getElementOffset = getElementOffset;
-  fabric.util.getElementPosition = getElementPosition;
+  fabric.util.getElementStyle = getElementStyle;
 
-})();
+})();