From 3f039eeb7a4bb662754c8d9a0099c85772f01817 Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Fri, 2 Jun 2017 14:37:51 +0200 Subject: [PATCH] Renamed file to get image Data. --- src/js/includes/Canvas.js | 15 ++++++++++++--- ...ansformationHandler.js => ImageDataHandler.js} | 4 ++-- src/js/includes/ImageEditor.js | 2 +- src/js/includes/Viewport.js | 4 ++-- src/js/includes/extend-fabric-functionality.js | 8 -------- 5 files changed, 17 insertions(+), 16 deletions(-) rename src/js/includes/{ImageTransformationHandler.js => ImageDataHandler.js} (94%) diff --git a/src/js/includes/Canvas.js b/src/js/includes/Canvas.js index 5973944..f9833d2 100644 --- a/src/js/includes/Canvas.js +++ b/src/js/includes/Canvas.js @@ -7,6 +7,7 @@ var DragbarHandler = require('./DragbarHandler'); var Viewport = require('./Viewport'); var ThreeDHandler = require('./3dHandler'); var MirrorHandler = require('./MirrorHandler'); +var ImageDataHandler = require('./ImageDataHandler'); var $document = $(document); @@ -27,7 +28,7 @@ var Canvas = fabric.util.createClass(fabric.Canvas, { if (this.getImage().__cropped && !this.get3dHandler().isEnabled()) { this.getApertures().setTransparent(false); - this.getImage().transformation.setCropData(); + this.getImageData().setCropData(); // Trigger event to tell the image has been dragged. $document.trigger('PIE:dragged'); } @@ -59,7 +60,7 @@ var Canvas = fabric.util.createClass(fabric.Canvas, { * @return {String} */ get3dUrl: function () { - var imageData = this.getImage().transformation.getData(); + var imageData = this.getImageData().getData(); var params = [ 'h=400', 'canvas[edge]=' + imageData.edge, @@ -98,13 +99,21 @@ var Canvas = fabric.util.createClass(fabric.Canvas, { }, /** - * @return {Viewport} + * @return {MirrorHandler} */ getMirror: function () { return this.__mirror || (this.__mirror = new MirrorHandler(this.getImage())); }, + /** + * @return {MirrorHandler} + */ + getImageData: function () { + return this.__imageData || + (this.__imageData = new ImageDataHandler(this.getImage())); + }, + /** * @return {Viewport} */ diff --git a/src/js/includes/ImageTransformationHandler.js b/src/js/includes/ImageDataHandler.js similarity index 94% rename from src/js/includes/ImageTransformationHandler.js rename to src/js/includes/ImageDataHandler.js index 1b17d40..fe74b8a 100644 --- a/src/js/includes/ImageTransformationHandler.js +++ b/src/js/includes/ImageDataHandler.js @@ -1,6 +1,6 @@ 'use strict'; -function ImageTransformationHandler(img) { +function ImageDataHandler(img) { /** * Gets information about how the cropped image is dragged @@ -54,4 +54,4 @@ function ImageTransformationHandler(img) { }; } -module.exports = ImageTransformationHandler; +module.exports = ImageDataHandler; diff --git a/src/js/includes/ImageEditor.js b/src/js/includes/ImageEditor.js index 45fd76d..11ed908 100644 --- a/src/js/includes/ImageEditor.js +++ b/src/js/includes/ImageEditor.js @@ -77,7 +77,7 @@ function ImageEditor(canvasId, args) { */ this.crop = function (width, height) { _canvas.getImage().__cropped = false; - _canvas.getImage().transformation.removeCropData(); + _canvas.getImageData().removeCropData(); _canvas.getViewport().set(width, height); return this; }; diff --git a/src/js/includes/Viewport.js b/src/js/includes/Viewport.js index cd7f6b4..23b876b 100644 --- a/src/js/includes/Viewport.js +++ b/src/js/includes/Viewport.js @@ -16,7 +16,7 @@ function Viewport(canvas) { * Applies viewport to page */ function apply() { - var cropData = canvas.getImage().transformation.getCropData(); + var cropData = canvas.getImageData().getCropData(); canvas.remove(_rect); _rect = new fabric.Rect({ @@ -139,7 +139,7 @@ function Viewport(canvas) { } else { canvas.getApertures().setTransparent(true); - canvas.getImage().transformation.removeCropData(); + canvas.getImageData().removeCropData(); // Trigger event to tell the image needs to be dragged. $(document).trigger('PIE:needs-dragging', { axis: _data.axis }); diff --git a/src/js/includes/extend-fabric-functionality.js b/src/js/includes/extend-fabric-functionality.js index 3a2ba86..8a16a80 100644 --- a/src/js/includes/extend-fabric-functionality.js +++ b/src/js/includes/extend-fabric-functionality.js @@ -1,7 +1,6 @@ 'use strict'; var Draggable = require('./Draggable'); -var ImageTransformationHandler = require('./ImageTransformationHandler'); var util = require('./util'); function ExtendFabricFunctionality() { @@ -26,13 +25,6 @@ function ExtendFabricFunctionality() { get: function() { return this.__draggable || (this.__draggable = new Draggable(this)); } - }, - - transformation: { - get: function() { - return this.__ImageTransformationHandler || - (this.__ImageTransformationHandler = new ImageTransformationHandler(this)); - } } });