diff options
| author | Ananya Sen | 2012-07-19 17:08:08 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-07-19 17:08:08 -0700 |
| commit | 0b6e845b4afe8cf3571351bd7b2aa872fab61c71 (patch) | |
| tree | 740b7be5ef8c28901dbceebb868950f8435ad4eb /js/controllers | |
| parent | b05137f559b6445017973d550fab5e43d6f4df57 (diff) | |
| download | ninja-0b6e845b4afe8cf3571351bd7b2aa872fab61c71.tar.gz | |
copy/paste from external apps - removed unnecessary selection change to fix PI redraw issue
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Conflicts:
js/controllers/clipboard-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/controllers')
| -rw-r--r-- | js/controllers/clipboard-controller.js | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/js/controllers/clipboard-controller.js b/js/controllers/clipboard-controller.js index c3543c95..afc94c8c 100644 --- a/js/controllers/clipboard-controller.js +++ b/js/controllers/clipboard-controller.js | |||
| @@ -87,11 +87,6 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component | |||
| 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 | } |
| @@ -111,11 +106,6 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component | |||
| 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 | } |
| @@ -142,11 +132,6 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component | |||
| 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"){ |