Refactor to fix tests

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "grapesjs",
   "description": "Open source Web Template Editor",
-  "version": "0.3.70",
+  "version": "0.3.71",
   "author": "Artur Arseniev",
   "homepage": "http://grapesjs.com",
   "main": [

package.json

@@ -1,7 +1,7 @@
 {
   "name": "grapesjs",
   "description": "Open source Web Template Editor",
-  "version": "0.3.70",
+  "version": "0.3.71",
   "author": "Artur Arseniev",
   "license": "BSD-3-Clause",
   "homepage": "http://grapesjs.com",

src/canvas/view/CanvasView.js

@@ -96,27 +96,47 @@ function(Backbone, FrameView) {
 			this.cvsOff = null;
 		},
 
-    /**
+		/**
-     * Returns element's data info
+		 * Return frame offset
-     * @param {HTMLElement} el
+		 * @return {Object}
-     * @return {Object}
+		 * @private
-     * @private
+		 */
-     */
+		getFrameOffset: function () {
-    getElementPos: function(el){
+			if(!this.frmOff)
-      if(!this.frmOff)
+				this.frmOff = this.offset(this.frame.el);
-        this.frmOff = this.offset(this.frame.el);
+			return this.frmOff;
-      if(!this.cvsOff)
+		},
-        this.cvsOff = this.offset(this.el);
+
-      var eo = this.offset(el);
+		/**
-      var top = eo.top + this.frmOff.top - this.cvsOff.top;
+		 * Return canvas offset
-      var left = eo.left + this.frmOff.left - this.cvsOff.left;
+		 * @return {Object}
-      return {
+		 * @private
-        top: top,
+		 */
-        left: left,
+		getCanvasOffset: function () {
-        height: el.offsetHeight,
+			if(!this.cvsOff)
-        width: el.offsetWidth
+				this.cvsOff = this.offset(this.el);
-      };
+			return this.cvsOff;
-    },
+		},
+
+		/**
+		 * Returns element's data info
+		 * @param {HTMLElement} el
+		 * @return {Object}
+		 * @private
+		 */
+		getElementPos: function(el) {
+			var frmOff = this.getFrameOffset();
+			var cvsOff = this.getCanvasOffset();
+			var eo = this.offset(el);
+			var top = eo.top + frmOff.top - cvsOff.top;
+			var left = eo.left + frmOff.left - cvsOff.left;
+			return {
+				top: top,
+				left: left,
+				height: el.offsetHeight,
+				width: el.offsetWidth
+			};
+		},
 
 		/**
 		 * Returns position data of the canvas element
@@ -124,8 +144,8 @@ function(Backbone, FrameView) {
 		 */
 		getPosition: function() {
 			var bEl = this.frame.el.contentDocument.body;
-			var fo = this.frmOff;
+			var fo = this.getFrameOffset();
-			var co = this.cvsOff;
+			var co = this.getCanvasOffset();
 			return {
 				top: fo.top + bEl.scrollTop - co.top,
 				left: fo.left + bEl.scrollLeft - co.left

test/specs/selector_manager/e2e/ClassManager.js

@@ -124,4 +124,4 @@ define(['GrapesJS', 'SelectorManager/model/Selectors', 'SelectorManager/view/Cla
       }
     };
 
-});
+});