diff options
author | Jon Reid | 2012-04-05 16:36:22 -0700 |
---|---|---|
committer | Jon Reid | 2012-04-05 16:36:22 -0700 |
commit | eb694fa5d39733264bce7ba832aabbe9c3d6c81e (patch) | |
tree | 049aaa66a6621e9f54b33b9861f50c20667ba0e3 /js/panels/drag-drop-composer.js | |
parent | a8ea8f377919c7f1a6af69311f55fd57727d9058 (diff) | |
parent | e186c49247689b5c2df6125037e2473636701d17 (diff) | |
download | ninja-eb694fa5d39733264bce7ba832aabbe9c3d6c81e.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/panels/drag-drop-composer.js')
-rw-r--r-- | js/panels/drag-drop-composer.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/panels/drag-drop-composer.js b/js/panels/drag-drop-composer.js index b36c8334..4791bd6d 100644 --- a/js/panels/drag-drop-composer.js +++ b/js/panels/drag-drop-composer.js | |||
@@ -91,7 +91,9 @@ exports.DragDropComposer = Montage.create(Composer, { | |||
91 | e.stopImmediatePropagation(); | 91 | e.stopImmediatePropagation(); |
92 | if (!this._dragover) { | 92 | if (!this._dragover) { |
93 | this._dragover = true; | 93 | this._dragover = true; |
94 | this.component.element.classList.add("dragOver"); | 94 | if (this.component.application.ninja.componentBeingDragged) { |
95 | this.component.element.classList.add("dragOver"); | ||
96 | } | ||
95 | } | 97 | } |
96 | } | 98 | } |
97 | }, | 99 | }, |