diff options
| author | Pushkar Joshi | 2012-03-06 17:04:40 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-06 17:04:40 -0800 |
| commit | 7a43958033906b2273de88bc2a26cda7a905d202 (patch) | |
| tree | f71817e712c4b07a48257a4f0b206cf9033421df /js/panels/drag-drop-composer.js | |
| parent | 264e3d8e6d3624083d2fab9fe2560234553bb2ad (diff) | |
| parent | 2e3943a8f751ec572066f168b58464c24b9f29e5 (diff) | |
| download | ninja-7a43958033906b2273de88bc2a26cda7a905d202.tar.gz | |
Merge branch 'master' into brushtool
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: { |