exclusively handle selectability of text via .OxSelectable and body.OxDragging (to be set/unset in dragstart/dragend handlers)
This commit is contained in:
parent
f8816e7522
commit
564ce69a78
17 changed files with 53 additions and 39 deletions
|
|
@ -362,6 +362,7 @@ Ox.AnnotationFolder = function(options, self) {
|
|||
|
||||
function dragstart() {
|
||||
if (self.options.showWidget) {
|
||||
Ox.$body.addClass('OxDragging');
|
||||
self.drag = {
|
||||
startSize: self.options.widgetSize
|
||||
};
|
||||
|
|
@ -384,6 +385,7 @@ Ox.AnnotationFolder = function(options, self) {
|
|||
|
||||
function dragend(e) {
|
||||
if (self.options.showWidget) {
|
||||
Ox.$body.removeClass('OxDragging');
|
||||
self.options.type == 'event'
|
||||
? self.$calendar.resizeCalendar()
|
||||
: self.$map.resizeMap();
|
||||
|
|
|
|||
|
|
@ -49,7 +49,8 @@ Ox.LargeVideoTimeline = function(options, self) {
|
|||
that.bindEvent({
|
||||
anyclick: click,
|
||||
dragstart: dragstart,
|
||||
drag: drag
|
||||
drag: drag,
|
||||
dragend: dragend
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -127,6 +128,7 @@ Ox.LargeVideoTimeline = function(options, self) {
|
|||
}
|
||||
|
||||
function dragstart(data) {
|
||||
Ox.$body.addClass('OxDragging');
|
||||
self.drag = {x: data.clientX};
|
||||
}
|
||||
|
||||
|
|
@ -140,6 +142,10 @@ Ox.LargeVideoTimeline = function(options, self) {
|
|||
triggerPositionEvent();
|
||||
}
|
||||
|
||||
function dragend() {
|
||||
Ox.$body.removeClass('OxDragging');
|
||||
}
|
||||
|
||||
function getImageURL(i, callback) {
|
||||
if (!self.isAsync) {
|
||||
callback(self.options.getImageURL(self.options.type, i));
|
||||
|
|
|
|||
|
|
@ -1250,6 +1250,7 @@ Ox.VideoPlayer = function(options, self) {
|
|||
}
|
||||
|
||||
function dragstart() {
|
||||
Ox.$body.addClass('OxDragging');
|
||||
self.drag = {
|
||||
position: self.options.position,
|
||||
paused: self.options.paused
|
||||
|
|
@ -1265,6 +1266,7 @@ Ox.VideoPlayer = function(options, self) {
|
|||
}
|
||||
|
||||
function dragend() {
|
||||
Ox.$body.removeClass('OxDragging');
|
||||
!self.drag.paused && togglePaused();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue