diff options
| author | Jon Reid | 2012-03-06 18:08:11 -0800 |
|---|---|---|
| committer | Jon Reid | 2012-03-06 18:08:11 -0800 |
| commit | a12603cfcfe9d82def3b972dcbcc80f1e790ad85 (patch) | |
| tree | f52c7dcc837dd98d28f505696b67b94db15e4c63 /js/panels/drag-drop-composer.js | |
| parent | 60bba95eaffa8b5c741c6c85fb84b327cd75d6c3 (diff) | |
| parent | bb6a1d82b2884b410f5859cc0c2cafd380acbe6a (diff) | |
| download | ninja-a12603cfcfe9d82def3b972dcbcc80f1e790ad85.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber
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: { |