Moved out code not connected to image editor into main.js and renamed fabric.ext files

2017-05-12 09:45:48 +02:00
parent 31483537a5
commit 7dfc94ad6e
4 changed files with 104 additions and 92 deletions
@@ -79,32 +79,4 @@ function ImageEditor(args) {
    });
 }

-$(function () {
-    // Inputs for the editor
-    var $input = {
-        w: $('#form-control input[name="w"]'),
-        h: $('#form-control input[name="h"]'),
-        image_id: $('#form-control input[name="image_id"]'),
-        mirror: $('#form-control input[name="mirror"]')
-    };
-
-    var imageUrl = '//images.photowall.com/products/' + $input.image_id.val() + '.jpg?h=450';
-
-    var editor = new ImageEditor({ 'type': 'canvas' })
-        .loadImage(imageUrl, function () {
-            $input.w.trigger('keyup');
-        });
-
-    var Event = {
-        DimensionChange: function () {
-            editor.crop($input.w.val(), $input.h.val());
-        },
-        Mirror: function () {
-            editor.canvas.image.transformation.set('mirror', this.checked);
-        }
-    };
-
-    $input.w.keyup(Event.DimensionChange);
-    $input.h.keyup(Event.DimensionChange);
-    $input.mirror.click(Event.Mirror);
-});
+module.exports = ImageEditor;
@@ -1,61 +0,0 @@
-'use strict';
-
-var Draggable = require('../Draggable');
-var ImageTransformationHandler = require('../ImageTransformationHandler');
-var util = require('../../util');
-
-$.extend(fabric.Object.prototype, {
-    cornerSize: 0,
-    hasBorders: false,
-    hasControls: false,
-    padding: 0,
-    selectable: false,
-    strokeWidth: 0,
-    addTo: function (canvas) {
-        canvas.add(this);
-        return this;
-    },
-});
-
-util.setProperties(fabric.Image.prototype, {
-    drag: {
-        get: function () {
-            return this.__draggable || (this.__draggable = new Draggable(this));
-        }
-    },
-
-    transformation: {
-        get: function () {
-            return this.__ImageTransformationHandler ||
-              (this.__ImageTransformationHandler = new ImageTransformationHandler(this));
-        }
-    }
-});
-
-$.extend(fabric.Rect.prototype, {
-  /**
-   * Gets the inner bounds of this fabric.Rect
-   * @return {Object}
-   */
-  getInsideBoundingRect: function () {
-      var bounds = this.getBoundingRect();
-      var returnValue = {
-          left:   bounds.left + this.strokeWidth,
-          top:    bounds.top + this.strokeWidth,
-          width:  bounds.width - this.strokeWidth * 2,
-          height: bounds.height - this.strokeWidth * 2
-      };
-
-      returnValue.min = {
-          left: returnValue.left,
-          top: returnValue.top
-      };
-
-      returnValue.max = {
-          left: returnValue.left + returnValue.width,
-          top: returnValue.top + returnValue.height
-      };
-
-      return returnValue;
-  }
-});
@@ -0,0 +1,68 @@
+'use strict';
+
+var Draggable = require('../Draggable');
+var ImageTransformationHandler = require('../ImageTransformationHandler');
+var util = require('../../util');
+
+function ExtendFabricFunctionality() {
+
+    // Set default values for the fabric canvas
+    $.extend(fabric.Object.prototype, {
+        cornerSize: 0,
+        hasBorders: false,
+        hasControls: false,
+        padding: 0,
+        selectable: false,
+        strokeWidth: 0,
+        addTo: function(canvas) {
+            canvas.add(this);
+            return this;
+        },
+    });
+
+
+    util.setProperties(fabric.Image.prototype, {
+        drag: {
+            get: function() {
+                return this.__draggable || (this.__draggable = new Draggable(this));
+            }
+        },
+
+        transformation: {
+            get: function() {
+                return this.__ImageTransformationHandler ||
+                    (this.__ImageTransformationHandler = new ImageTransformationHandler(this));
+            }
+        }
+    });
+
+    $.extend(fabric.Rect.prototype, {
+        /**
+         * Gets the inner bounds of this fabric.Rect
+         * @return {Object}
+         */
+        getInsideBoundingRect: function() {
+            var bounds = this.getBoundingRect();
+            var returnValue = {
+                left: bounds.left + this.strokeWidth,
+                top: bounds.top + this.strokeWidth,
+                width: bounds.width - this.strokeWidth * 2,
+                height: bounds.height - this.strokeWidth * 2
+            };
+
+            returnValue.min = {
+                left: returnValue.left,
+                top: returnValue.top
+            };
+
+            returnValue.max = {
+                left: returnValue.left + returnValue.width,
+                top: returnValue.top + returnValue.height
+            };
+
+            return returnValue;
+        }
+    });
+}
+
+module.exports = ExtendFabricFunctionality;
@@ -2,7 +2,40 @@

 (function () {

-    require('./components/ImageEditor/fabric.ext/ObjectDefaults');
-    require('./components/ImageEditor/ImageEditor');
+    var ExtendFabricFunctionality = require('./components/extend-fabric-functionality');
+    var ImageEditor = require('./components/ImageEditor/ImageEditor');
+
+    ExtendFabricFunctionality();
+    ImageEditor();

 }());
+
+$(function () {
+    // Inputs for the editor
+    var $input = {
+        w: $('#form-control input[name="w"]'),
+        h: $('#form-control input[name="h"]'),
+        image_id: $('#form-control input[name="image_id"]'),
+        mirror: $('#form-control input[name="mirror"]')
+    };
+
+    var imageUrl = '//images.photowall.com/products/' + $input.image_id.val() + '.jpg?h=450';
+
+    var editor = new ImageEditor({ 'type': 'canvas' })
+        .loadImage(imageUrl, function () {
+            $input.w.trigger('keyup');
+        });
+
+    var Event = {
+        DimensionChange: function () {
+            editor.crop($input.w.val(), $input.h.val());
+        },
+        Mirror: function () {
+            editor.canvas.image.transformation.set('mirror', this.checked);
+        }
+    };
+
+    $input.w.keyup(Event.DimensionChange);
+    $input.h.keyup(Event.DimensionChange);
+    $input.mirror.click(Event.Mirror);
+}());