diff options
author | Jose Antonio Marquez | 2012-03-06 17:02:44 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-06 17:02:44 -0800 |
commit | fca92904597895675ddd216399cd235f3c5a7cfa (patch) | |
tree | 77c30a958c0283a6aa208b93640c6008eeb943e2 /js/panels/drag-drop-composer.js | |
parent | ec7cbc95de031d2be667c2a8629a9d63e91f7e1a (diff) | |
parent | eebb7de4d19cddec9c763a073d8cf41d76fe70f7 (diff) | |
download | ninja-fca92904597895675ddd216399cd235f3c5a7cfa.tar.gz |
Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate
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: { |