diff options
| author | Nivesh Rajbhandari | 2012-03-06 15:44:04 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-03-06 15:44:04 -0800 |
| commit | b047a9414cc07f2cb20dbfd7240ca9b0bfdc231d (patch) | |
| tree | ec1e9d373636569e09cdf669f063d4d2a1e441f4 /js/panels/drag-drop-composer.js | |
| parent | 792793cd3991032b4840ade67f98ae8eae2d30a0 (diff) | |
| parent | 4f498b43264327f5886e0370bd3536453d47570a (diff) | |
| download | ninja-b047a9414cc07f2cb20dbfd7240ca9b0bfdc231d.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
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: { |