From 5a6dae3b47a6f51b4e9ec5f1074b39a4b9781aab Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Thu, 21 Jul 2016 14:28:24 +0200
Subject: [PATCH] Update move and select commands

---
 src/commands/view/MoveComponent.js   |  4 +--
 src/commands/view/SelectComponent.js | 47 +++++++++++++++++-----------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/commands/view/MoveComponent.js b/src/commands/view/MoveComponent.js
index c7d6a5a72..6a34a1f0d 100644
--- a/src/commands/view/MoveComponent.js
+++ b/src/commands/view/MoveComponent.js
@@ -13,7 +13,7 @@ define(['backbone', './SelectComponent','./SelectPosition'],
 			},
 
 			enable: function(){
-				this.frameEl.contentWindow.onscroll = this.onFrameScroll.bind(this);
+				_.bindAll(this, 'onFrameScroll');
 				this.$el.css('cursor','move');
 				this.$el.on('mousedown', this.initSorter);
 				this.startSelectComponent();
@@ -77,11 +77,11 @@ define(['backbone', './SelectComponent','./SelectPosition'],
 
 			stop: function(){
 				this.stopSelectComponent();
+				this.hideBadge();
 				this.$badge = $(this.getBadge());
 				this.$badge.removeClass(this.badgeClass);
 				this.$hl = $(this.canvas.getHighlighter());
 				this.$hl.removeClass(this.hoverClass);
-				this.frameEl.contentWindow.onscroll = null;
 				this.$el.css('cursor','');//changes back aspect of the cursor
 				this.$el.unbind();//removes all attached events
 				this.$el.removeClass(this.noSelClass);
diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js
index 5a895af2b..36d4a4e27 100644
--- a/src/commands/view/SelectComponent.js
+++ b/src/commands/view/SelectComponent.js
@@ -11,17 +11,14 @@ define(function() {
 
 
 			enable: function() {
-				_.bindAll(this,'copyComp','pasteComp');
-				this.frameEl.contentWindow.onscroll = this.onFrameScroll.bind(this);
+				_.bindAll(this,'copyComp', 'pasteComp', 'onFrameScroll');
 				var config	= this.config.em.get('Config');
 				this.startSelectComponent();
-
 				// TODO refactor
 				if(config.copyPaste){
 					key('⌘+c, ctrl+c', this.copyComp);
 					key('⌘+v, ctrl+v', this.pasteComp);
 				}
-
 				this.listenTo(this.em.editor, 'change:device', this.clearOff);
 			},
 
@@ -63,11 +60,23 @@ define(function() {
 			 * @private
 			 * */
 			startSelectComponent: function() {
+				this.getContentWindow().on('scroll', this.onFrameScroll);
 				this.selEl = $(this.getCanvasBody()).find('*');
 				this.selEl.on('mouseover',this.onHover)
 					.on('mouseout', this.onOut)
 					.on('click', this.onClick);
-				$(this.frameEl.contentWindow).on('keydown', this.onKeyPress);
+				this.getContentWindow().on('keydown', this.onKeyPress);
+			},
+
+			/**
+			 * Stop select component event
+			 * @private
+			 * */
+			stopSelectComponent: function() {
+				this.getContentWindow().off('scroll', this.onFrameScroll);
+				if(this.selEl)
+					this.selEl.trigger('mouseout').off('mouseover mouseout click');
+				this.selEl = null;
 			},
 
 			/**
@@ -149,16 +158,6 @@ define(function() {
 				this.hl.css({ left: elPos.left, top: elPos.topP, height: elPos.height, width: elPos.width });
 			},
 
-			/** Stop select component event
-			 * @param Event
-			 * @private
-			 * */
-			stopSelectComponent: function(e) {
-				if(this.selEl)
-					this.selEl.trigger('mouseout').off('mouseover mouseout click');
-				this.selEl = null;
-			},
-
 			/**
 			 * Say what to do after the component was selected
 			 * @param {Object}	e
@@ -223,8 +222,7 @@ define(function() {
 			 * @private
 			 */
 			onFrameScroll: function(e){
-				this.canvasTool.style.top = '-' + this.bodyEl.scrollTop + 'px';
-				this.canvasTool.style.left = '-' + this.bodyEl.scrollLeft + 'px';
+				console.log('scrolling');
 				if(this.cacheEl)
 					this.updateBadge(this.cacheEl);
 			},
@@ -275,6 +273,16 @@ define(function() {
 				});
 			},
 
+			/**
+			 * Returns content window
+			 * @private
+			 */
+			getContentWindow: function(){
+				if(!this.contWindow)
+					this.contWindow = $(this.frameEl.contentWindow);
+				return this.contWindow;
+			},
+
 			run: function(em, sender) {
 				this.em = em;
 				this.enable();
@@ -287,7 +295,6 @@ define(function() {
 			  this.frameOff = this.canvasOff = this.adjScroll = null;
 
 			  var frameEl = this.canvas.getFrameEl();
-				frameEl.contentWindow.onscroll = null;
 				var sel = this.editorModel.get('selectedComponent');
 				if(sel)
 					this.cleanPrevious(sel);
@@ -298,7 +305,9 @@ define(function() {
 				this.editorModel.set('selectedComponent',null);
 				key.unbind('⌘+c, ctrl+c');
 				key.unbind('⌘+v, ctrl+v');
-				$(this.frameEl.contentWindow).off('keydown', this.onKeyPress);
+				var cw = this.getContentWindow();
+				cw.off('keydown', this.onKeyPress);
+				this.stopSelectComponent();
 			}
 		};
 });
\ No newline at end of file