diff options
| author | Jonathan Duran | 2012-07-20 14:28:33 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-07-20 14:28:33 -0700 |
| commit | c010ce7257df2545abb645318918c67e8e49251d (patch) | |
| tree | 7528ec644389f89cf1d8684190f4545234cab1cd /js/controllers | |
| parent | 936fbd6d76d35e3f9574983682c266de6dce55f7 (diff) | |
| parent | bf4bd611e6fadf45fa9dc50ad72902040075ff0c (diff) | |
| download | ninja-c010ce7257df2545abb645318918c67e8e49251d.tar.gz | |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Diffstat (limited to 'js/controllers')
| -rw-r--r-- | js/controllers/clipboard-controller.js | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/js/controllers/clipboard-controller.js b/js/controllers/clipboard-controller.js index c3543c95..3eba1bec 100644 --- a/js/controllers/clipboard-controller.js +++ b/js/controllers/clipboard-controller.js | |||
| @@ -82,16 +82,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component | |||
| 82 | 82 | ||
| 83 | // Don't do anything if an input or other control is focused except the copy menu button | 83 | // Don't do anything if an input or other control is focused except the copy menu button |
| 84 | if(document.activeElement.nodeName !== "BODY") { | 84 | if(document.activeElement.nodeName !== "BODY") { |
| 85 | if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") { | 85 | if(!(document.activeElement.getAttribute("data-montage-id") === "menuItemButton")) { |
| 86 | return; | 86 | return; |
| 87 | } | 87 | } |
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | //perform clipboard operations only if selection tool is selected | ||
| 91 | if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){ | ||
| 92 | return; | ||
| 93 | } | ||
| 94 | |||
| 95 | if(this.clipboardContext === "stage"){ | 90 | if(this.clipboardContext === "stage"){ |
| 96 | ElementsClipboardAgent.copy(clipboardEvent); | 91 | ElementsClipboardAgent.copy(clipboardEvent); |
| 97 | } | 92 | } |
| @@ -106,16 +101,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component | |||
| 106 | 101 | ||
| 107 | // Don't do anything if an input or other control is focused | 102 | // Don't do anything if an input or other control is focused |
| 108 | if(document.activeElement.nodeName !== "BODY") { | 103 | if(document.activeElement.nodeName !== "BODY") { |
| 109 | if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") { | 104 | if(!(document.activeElement.getAttribute("data-montage-id") === "menuItemButton")) { |
| 110 | return; | 105 | return; |
| 111 | } | 106 | } |
| 112 | } | 107 | } |
| 113 | 108 | ||
| 114 | //perform clipboard operations only if selection tool is selected | ||
| 115 | if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){ | ||
| 116 | return; | ||
| 117 | } | ||
| 118 | |||
| 119 | if(this.clipboardContext === "stage"){ | 109 | if(this.clipboardContext === "stage"){ |
| 120 | ElementsClipboardAgent.cut(clipboardEvent); | 110 | ElementsClipboardAgent.cut(clipboardEvent); |
| 121 | } | 111 | } |
| @@ -137,16 +127,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component | |||
| 137 | 127 | ||
| 138 | // Don't do anything if an input or other control is focused | 128 | // Don't do anything if an input or other control is focused |
| 139 | if(document.activeElement.nodeName !== "BODY") { | 129 | if(document.activeElement.nodeName !== "BODY") { |
| 140 | if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") { | 130 | if(!(document.activeElement.getAttribute("data-montage-id") === "menuItemButton")) { |
| 141 | return; | 131 | return; |
| 142 | } | 132 | } |
| 143 | } | 133 | } |
| 144 | 134 | ||
| 145 | //perform clipboard operations only if selection tool is selected | ||
| 146 | if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){ | ||
| 147 | return; | ||
| 148 | } | ||
| 149 | |||
| 150 | //TODO: return if stage is not focussed | 135 | //TODO: return if stage is not focussed |
| 151 | 136 | ||
| 152 | if(this.clipboardContext === "stage"){ | 137 | if(this.clipboardContext === "stage"){ |