Merge branch 'copy-paste-bugfix' of https://github.com/ananyasen/ninja

1 files changed, 15 insertions, 0 deletions

diff --git a/js/controllers/clipboard-controller.js b/js/controllers/clipboard-controller.js
index d2173e31..50538477 100644
--- a/js/controllers/clipboard-controller.js
+++ b/js/controllers/clipboard-controller.js
@@ -85,6 +85,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
                 return;
             }
 
+            //perform clipboard operations only if selection tool is selected
+            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
+                return;
+            }
+
             if(this.clipboardContext === "stage"){
                 ElementsClipboardAgent.copy(clipboardEvent);
             }
@@ -102,6 +107,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
                 return;
             }
 
+            //perform clipboard operations only if selection tool is selected
+            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
+                return;
+            }
+
             if(this.clipboardContext === "stage"){
                 ElementsClipboardAgent.cut(clipboardEvent);
             }
@@ -126,6 +136,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
                 return;
             }
 
+            //perform clipboard operations only if selection tool is selected
+            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
+                return;
+            }
+
             //TODO: return if stage is not focussed
 
             if(this.clipboardContext === "stage"){