diff options
author | Valerio Virgillito | 2012-03-06 16:18:10 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-03-06 16:18:10 -0800 |
commit | 2e3943a8f751ec572066f168b58464c24b9f29e5 (patch) | |
tree | 3975b1aa412e5b8c377accfe15536622544d6826 /js/panels/drag-drop-composer.js | |
parent | c2805e03c84b6e598556fd06d1ede7aaeea7ce9c (diff) | |
parent | 4f498b43264327f5886e0370bd3536453d47570a (diff) | |
download | ninja-2e3943a8f751ec572066f168b58464c24b9f29e5.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
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: { |