diff options
| author | Nivesh Rajbhandari | 2012-03-12 16:25:28 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-03-12 16:25:28 -0700 |
| commit | 5fb358d9e80a364d5f300d60b7a9fe0f773741e7 (patch) | |
| tree | 2c4d5292b19c91697dffb542f369ec9dcb340f77 /js/panels/drag-drop-composer.js | |
| parent | 5f9b67be3b8bdb391d021103c6bcee6be2f6cdf4 (diff) | |
| parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
| download | ninja-5fb358d9e80a364d5f300d60b7a9fe0f773741e7.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/panels/drag-drop-composer.js')
| -rw-r--r-- | js/panels/drag-drop-composer.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/drag-drop-composer.js b/js/panels/drag-drop-composer.js index e09f601d..b36c8334 100644 --- a/js/panels/drag-drop-composer.js +++ b/js/panels/drag-drop-composer.js | |||
| @@ -10,7 +10,7 @@ var Composer = require("montage/ui/composer/composer").Composer; | |||
| 10 | exports.DragDropComposer = Montage.create(Composer, { | 10 | exports.DragDropComposer = Montage.create(Composer, { |
| 11 | 11 | ||
| 12 | draggable: { | 12 | draggable: { |
| 13 | value: false // TODO: Turning this off until color Panel bug fixes are in | 13 | value: true |
| 14 | }, | 14 | }, |
| 15 | 15 | ||
| 16 | droppable: { | 16 | droppable: { |