Permalink
Browse files

Merge pull request #299 from dseif/t519b

T519b
  • Loading branch information...
secretrobotron committed May 22, 2012
2 parents 756a559 + f8f0de4 commit 9fb319c5d9b8d0cd569088a7dc38b89740678e81
Showing with 8 additions and 4 deletions.
  1. +1 −1 src/core/views/trackevent-view.js
  2. +7 −3 src/timeline/media.js
@@ -210,7 +210,7 @@ define( [ "core/logger", "core/eventmanager", "util/dragndrop" ], function( Logg
_element.addEventListener( "mousedown", function ( e ) {
_this.dispatch( "trackeventmousedown", { originalEvent: e, trackEvent: trackEvent } );
- }, false);
+ }, true);
_element.addEventListener( "mouseup", function ( e ) {
_this.dispatch( "trackeventmouseup", { originalEvent: e, trackEvent: trackEvent } );
}, false);
View
@@ -11,7 +11,9 @@ define( [
"./timebar",
"./zoombar",
"./status",
- "./trackhandles"
+ "./trackhandles",
+ // Include util/lang so we have access to our classList shim for browsers that don't support it
+ "util/lang"
],
function(
TrackEvent,
@@ -22,7 +24,8 @@ define( [
TimeBar,
ZoomBar,
Status,
- TrackHandles ){
+ TrackHandles,
+ LangUtil ) {
var INITIAL_ZOOM = 100,
ZOOM_FACTOR = 100;
@@ -118,7 +121,8 @@ define( [
_currentMouseDownTrackEvent = trackEvent;
- if( trackEvent.selected === true && originalEvent.shiftKey && _selectedTracks.length > 1 ){
+ if( trackEvent.selected === true && originalEvent.shiftKey && _selectedTracks.length > 1 &&
+ !originalEvent.srcElement.classList.contains( "handle" ) ) {
trackEvent.selected = false;
}
else {

0 comments on commit 9fb319c

Please sign in to comment.