sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

exclusively handle selectability of text via .OxSelectable and body.OxDragging (to be set/unset in dragstart/dragend handlers)

Browse source
This commit is contained in:
rlx 2013-07-19 08:42:25 +00:00
commit 564ce69a78
17 changed files with 53 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/Ox.UI/js/Bar/Resizebar.js
View file

@ -77,6 +77,7 @@ Ox.Resizebar = function(options, self) {
function dragstart(data) {
if (self.options.resizable && !self.options.collapsed) {
Ox.$body.addClass('OxDragging');
self.drag = {
startPos: data[self.clientXY],
startSize: self.options.size
@ -121,6 +122,7 @@ Ox.Resizebar = function(options, self) {
function dragend() {
if (self.options.resizable && !self.options.collapsed) {
Ox.$body.removeClass('OxDragging');
self.options.size != self.drag.startSize && triggerEvents('resizeend');
}
}

4
source/Ox.UI/js/Calendar/Calendar.js
View file

@ -606,6 +606,7 @@ Ox.Calendar = function(options, self) {
function dragstart(data) {
//if ($(e.target).is(':not(.OxLine > .OxEvent)')) {
Ox.$body.addClass('OxDragging');
self.drag = {
top: self.$container[0].scrollTop,
x: data.clientX
@ -642,6 +643,7 @@ Ox.Calendar = function(options, self) {
function dragend(data) {
if (self.drag) {
Ox.$body.removeClass('OxDragging');
dragafter(data);
self.drag = null;
}
@ -659,6 +661,7 @@ Ox.Calendar = function(options, self) {
}
function dragstartScrollbar(data) {
Ox.$body.addClass('OxDragging');
self.drag = {x: data.clientX};
}
@ -682,6 +685,7 @@ Ox.Calendar = function(options, self) {
}
function dragendScrollbar(data) {
Ox.$body.removeClass('OxDragging');
dragafterScrollbar(data);
self.drag = null;
}

2
source/Ox.UI/js/Code/DocPage.js
View file

@ -67,7 +67,7 @@ Ox.DocPage = function(options, self) {
.appendTo(self.$toolbar);
}
self.$page = Ox.Container().addClass('OxDocPage OxDocument');
self.$page = Ox.Container().addClass('OxDocPage OxDocument OxSelectable');
that.setElement(
Ox.SplitPanel({

2
source/Ox.UI/js/Code/SourceViewer.js
View file

@ -64,7 +64,7 @@ Ox.SourceViewer = function(options, self) {
var $section = $('<tr>')
.appendTo(self.$table),
$comment = $('<td>')
.addClass('OxComment OxSerif')
.addClass('OxComment OxSerif OxSelectable')
.html(Ox.addLinks(section.comment, true))
.appendTo($section),
$code = $('<td>')

2
source/Ox.UI/js/Code/SyntaxHighlighter.js
View file

@ -118,7 +118,7 @@ Ox.SyntaxHighlighter = function(options, self) {
});
$source = Ox.Element()
.addClass('OxSourceCode')
.addClass('OxSourceCode OxSelectable')
.html(source)
.appendTo(that);
if (self.options.lineLength) {

2
source/Ox.UI/js/Form/Editable.js
View file

@ -93,7 +93,7 @@ Ox.Editable = function(options, self) {
self.css = {};
self.$value = Ox.Element(self.options.type == 'input' ? '<span>' : '<div>')
.addClass('OxValue')
.addClass('OxValue OxSelectable')
.html(formatValue())
.appendTo(that);

2
source/Ox.UI/js/Form/EditableContent.js
View file

@ -42,7 +42,7 @@ Ox.EditableContent = function(options, self) {
!self.options.editing && self.$value.html(formatValue());
}
})
.addClass('OxEditableContent')
.addClass('OxEditableContent OxSelectable')
.on({
blur: self.options.submitOnBlur ? submit : blur,
click: function(e) {

4
source/Ox.UI/js/List/List.js
View file

@ -424,6 +424,7 @@ Ox.List = function(options, self) {
|| $parent.is('.OxTarget') // table lists
|| $parent.parent().is('.OxTarget') // table lists with div inside cell
) && !$target.is('.OxSpecialTarget')) {
Ox.$body.addClass('OxDragging');
self.drag = {
ids: self.options.selected
};
@ -466,6 +467,7 @@ Ox.List = function(options, self) {
function dragend(data) {
if (self.drag) {
Ox.$body.removeClass('OxDragging');
that.triggerEvent('draganddropend', {
event: data,
ids: self.drag.ids
@ -933,6 +935,7 @@ Ox.List = function(options, self) {
}
function movestart(data) {
Ox.$body.addClass('OxDragging');
var pos = findItemPosition(data),
$items = self.$items.filter(function($item, i) {
if ($item.is('.OxSelected')) {
@ -973,6 +976,7 @@ Ox.List = function(options, self) {
function moveend(data) {
var ids = [];
Ox.$body.removeClass('OxDragging');
self.$items.forEach(function($item) {
$item.removeClass('OxDrag');
ids.push($item.options('data')[self.options.unique]);

4
source/Ox.UI/js/List/TableList.js
View file

@ -568,6 +568,7 @@ Ox.TableList = function(options, self) {
}
function dragstartColumn(id, e) {
Ox.$body.addClass('OxDragging');
self.drag = {
columnOffsets: getColumnOffsets(),
listOffset: that.$element.offset().left - that.$body.scrollLeft(),
@ -631,6 +632,7 @@ Ox.TableList = function(options, self) {
function dragendColumn(id, e) {
var column = self.visibleColumns.splice(self.drag.stopPos, 1)[0],
width = self.columnWidths.splice(self.drag.stopPos, 1)[0];
Ox.$body.removeClass('OxDragging');
self.visibleColumns.splice(self.drag.stopPos, 0, column);
self.columnWidths.splice(self.drag.stopPos, 0, width);
that.$head.$content.empty();
@ -645,6 +647,7 @@ Ox.TableList = function(options, self) {
function dragstartResize(id, e) {
var pos = getColumnPositionById(id);
Ox.$body.addClass('OxDragging');
self.drag = {
startWidth: self.columnWidths[pos]
};
@ -662,6 +665,7 @@ Ox.TableList = function(options, self) {
function dragendResize(id, e) {
var pos = getColumnPositionById(id);
// fixme: shouldn't this be resizecolumn?
Ox.$body.removeClass('OxDragging');
that.triggerEvent('columnresize', {
id: id,
width: self.columnWidths[pos]

2
source/Ox.UI/js/List/TreeList.js
View file

@ -111,7 +111,7 @@ Ox.TreeList = function(options, self) {
$cell.appendTo($item);
$icon && $icon.addClass(data.items ? 'OxToggle' : 'OxTarget').appendTo($cell);
$('<div>')
.addClass('OxCell OxTarget' + (!data.items ? ' OxSelectable' : ''))
.addClass('OxCell OxTarget')
.css({
width: self.options.width - padding - 32 - Ox.UI.SCROLLBAR_SIZE + 'px'
})

3
source/Ox.UI/js/Map/MapMarker.js
View file

@ -101,7 +101,7 @@ Ox.MapMarker = function(options) {
}
function dragstart(e) {
Ox.$body.addClass('OxDragging');
}
function drag(e) {
@ -134,6 +134,7 @@ Ox.MapMarker = function(options) {
}
function dragend(e) {
Ox.$body.removeClass('OxDragging');
that.map.triggerEvent('changeplaceend', that.place);
}

2
source/Ox.UI/js/Map/MapRectangleMarker.js
View file

@ -37,6 +37,7 @@ Ox.MapRectangleMarker = function(options) {
});
function dragstart(e) {
Ox.$body.addClass('OxDragging');
that.drag = {
lat: e.latLng.lat(),
lng: e.latLng.lng()
@ -73,6 +74,7 @@ Ox.MapRectangleMarker = function(options) {
function dragend(e) {
var south;
Ox.$body.removeClass('OxDragging');
if (that.place.south > that.place.north) {
south = that.place.south;
that.place.south = that.place.north;

2
source/Ox.UI/js/Video/AnnotationFolder.js
View file

@ -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();

8
source/Ox.UI/js/Video/LargeVideoTimeline.js
View file

@ -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));

2
source/Ox.UI/js/Video/VideoPlayer.js
View file

@ -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();
}

10
source/Ox.UI/js/Window/Dialog.js
View file

@ -234,6 +234,7 @@ Ox.Dialog = function(options, self) {
function dragstart(event) {
var offset;
if (!$(event.target).is('.OxButton')) {
Ox.$body.addClass('OxDragging');
offset = that.offset();
self.drag = {
left: offset.left,
@ -262,8 +263,11 @@ Ox.Dialog = function(options, self) {
}
}
function dragend() {
that.unwrap();
function dragend(event) {
if (!$(event.target).is('.OxButton')) {
Ox.$body.removeClass('OxDragging');
that.unwrap();
}
}
function getButtonById(id) {
@ -329,6 +333,7 @@ Ox.Dialog = function(options, self) {
}
function resizestart(event) {
Ox.$body.addClass('OxDragging');
var edge = event.target.className.slice(17).toLowerCase(),
offset = that.offset();
self.drag = {
@ -506,6 +511,7 @@ Ox.Dialog = function(options, self) {
}
function resizeend() {
Ox.$body.removeClass('OxDragging');
that.unwrap();
that.triggerEvent('resizeend', {
width: self.options.width,