library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Grunt: Ran and fixed jshint errors

Browse Source
This commit is contained in:
Dave Stein 2012-12-21 11:33:13 -05:00
parent ddcb7695e3
commit 15e3f28c4f
5 changed files with 56 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/unit/draggable/draggable_common.js
View File

@ -27,7 +27,7 @@ TestHelpers.commonWidgetTests( "draggable", {
snapTolerance: 20,
stack: false,
zIndex: false,
cancel: null,
cancel: null
// // methods
// destroy: null,

23
ui/jquery.ui.draggable.js vendored
View File

@ -555,7 +555,7 @@ if ( $.uiBackCompat !== false ) {
body = $( this.document[0].body );
// Cache original cursor to set back
this.element.on( "dragstart", function( event, ui ) {
this.element.on( "dragstart", function() {
if ( self.options.cursor ) {
startCursor = body[0].style.cursor;
@ -564,14 +564,14 @@ if ( $.uiBackCompat !== false ) {
});
// Set cursor to what user wants during drag
this.element.on( "drag", function( event, ui ) {
this.element.on( "drag", function() {
if ( self.options.cursor ) {
body.css( "cursor", self.options.cursor );
}
});
// Set back cursor to whatever default was
this.element.on( "dragstop", function( event, ui ) {
this.element.on( "dragstop", function() {
if ( self.options.cursor ) {
body.css( "cursor", startCursor );
@ -701,7 +701,7 @@ if ( $.uiBackCompat !== false ) {
this._super();
this.element.on( "dragstart", function( event, ui ) {
this.element.on( "dragstart", function() {
// No need to continue
if ( !self.options.opacity ) {
@ -716,7 +716,7 @@ if ( $.uiBackCompat !== false ) {
});
this.element.on( "dragstop", function( event, ui ) {
this.element.on( "dragstop", function() {
// No need to continue
if ( !self.options.opacity ) {
@ -747,7 +747,7 @@ if ( $.uiBackCompat !== false ) {
this._super();
this.element.on( "dragbeforestart", function( event, ui ) {
this.element.on( "dragbeforestart", function() {
// No need to continue
if ( !self.options.revert ) {
@ -761,7 +761,7 @@ if ( $.uiBackCompat !== false ) {
});
this.element.on( "dragstop", function( event, ui ) {
this.element.on( "dragstop", function() {
// No need to continue
if ( !self.options.revert ) {
@ -794,7 +794,7 @@ if ( $.uiBackCompat !== false ) {
this._super();
this.element.on( "dragstart", function( event, ui ) {
this.element.on( "dragstart", function() {
// No need to continue
if ( !self.options.zIndex ) {
@ -809,7 +809,7 @@ if ( $.uiBackCompat !== false ) {
});
this.element.on( "dragstop", function( event, ui ) {
this.element.on( "dragstop", function() {
// No need to continue
if ( !self.options.zIndex ) {
@ -893,7 +893,7 @@ if ( $.uiBackCompat !== false ) {
this._super();
this.element.on( "dragbeforestart", function( event, ui ) {
this.element.on( "dragbeforestart", function() {
var stack = self.options.stack,
group, min;
@ -905,8 +905,7 @@ if ( $.uiBackCompat !== false ) {
group = $.makeArray( $(stack) ).sort(function(a,b) {
var aZIndex = parseInt( $(a).css("zIndex"), 10 ),
bZIndex = parseInt( $(b).css("zIndex"), 10 ),
min;
bZIndex = parseInt( $(b).css("zIndex"), 10 );
return ( aZIndex || 0) - ( bZIndex|| 0);
});

4
ui/jquery.ui.droppable.js vendored
View File

@ -63,7 +63,7 @@ $.widget( "ui.droppable", {
/** internal **/
_start: function( event, ui ) {
_start: function( event ) {
if ( this.options.accept && !$( event.target ).is( this.options.accept ) ) {
return false;
}
@ -93,7 +93,7 @@ $.widget( "ui.droppable", {
}
},
_stop: function( event, ui ) {
_stop: function( event ) {
if ( this.over ) {
this._trigger( "drop", event, this._uiHash() );
}

5
ui/jquery.ui.interaction.js vendored
View File

@ -35,7 +35,7 @@ $.widget( "ui.interaction", {
/** protected **/
_isValidTarget: function( target ) {
_isValidTarget: function() {
return true;
},
@ -138,8 +138,7 @@ interaction.hooks.mouse = {
// WebKit doesn't support TouchList.identifiedTouch()
function getTouch( event ) {
var touch,
touches = event.originalEvent.changedTouches,
var touches = event.originalEvent.changedTouches,
i = 0, length = touches.length;
for ( ; i < length; i++ ) {

84
ui/jquery.ui.sortable.js vendored
View File

@ -29,7 +29,7 @@ $.widget( "ui.sortable", $.ui.interaction, {
version: "@VERSION",
widgetEventPrefix: "sort",
items: 'li', // TODO: move to options when API is ready
// dragEl: element being dragged (original or helper)
// position: final CSS position of dragEl
// offset: offset of dragEl
@ -49,56 +49,54 @@ $.widget( "ui.sortable", $.ui.interaction, {
},
_create: function() {
this._super();
this.element.addClass( "ui-sortable" );
this._setSortablePositions();
},
_setSortablePositions: function() {
var sortablePositions = this.sortablePositions = [];
this.element.find( this.items ).each( function() {
var el = $(this);
sortablePositions.push([{
el: el,
offset: el.offset()
}]);
});
},
},
/** interaction interface **/
_isValidTarget: function( element ) {
// TODO: options for what is actually valid
return element.is( this.items );
},
_start: function( event, pointerPosition ) {
var offset;
// The actual dragging element, should always be a jQuery object
// this.dragEl = this.options.helper ?
// this._createHelper( pointerPosition ) :
// this.element;
this.dragEl = $(event.target);
// Save original css position if there are currently styles
// Otherwise the original css will be set back by removing attribute
if ( this.dragEl[0].style.position ) {
this.originalCssPosition = this.dragEl[0].style.position;
}
// Create placeholder for while element is dragging
// TODO: what do we do about IDs?
// TODO: possibly use CSS for visibility portion
@ -108,7 +106,7 @@ $.widget( "ui.sortable", $.ui.interaction, {
});
this.dragEl.after( this.placeholder );
this.dragEl.css( 'position', 'absolute' );
// // _createHelper() ensures that helpers are in the correct position
@ -154,7 +152,7 @@ $.widget( "ui.sortable", $.ui.interaction, {
if ( this._trigger( "beforeStart", event,
this._originalHash( pointerPosition ) ) === false ) {
return false;
}
this._setCss();
@ -164,13 +162,13 @@ $.widget( "ui.sortable", $.ui.interaction, {
this._trigger( "start", event, this._fullHash( pointerPosition ) );
this._blockFrames();
},
_move: function( event, pointerPosition ) {
var sort, sortItem, top, left, sortIndex,
var sort, sortItem, sortIndex,
len = this.sortablePositions.length;
this._preparePosition( pointerPosition );
// // If user cancels drag, don't move the element
@ -182,23 +180,23 @@ $.widget( "ui.sortable", $.ui.interaction, {
// Scroll the scrollParent, if needed
this._handleScrolling( pointerPosition );
for ( sortIndex=0; sortIndex<len; ++sortIndex ) {
for ( sort in this.sortablePositions[sortIndex] ) {
sortItem = this.sortablePositions[sortIndex][sort];
// Don't bother checking against self
if ( sortItem.el[0] === this.dragEl[0] ) {
continue;
}
if ( this._over( sortItem ) ) {
// TODO: cache height of element
if ( ( this.offset.top + this.dragEl.height() ) > ( sortItem.offset.top + sortItem.el.height()/2 ) ) {
sortItem.el.after( this.dragEl );
this.dragEl.after( this.placeholder );
this._setSortablePositions();
@ -208,18 +206,18 @@ $.widget( "ui.sortable", $.ui.interaction, {
this.dragEl.before( this.placeholder );
this._setSortablePositions();
}
}
}
}
},
// TODO: swap out for real tolerance options
_over: function( sortItem ) {
// TODO: use same cache from _move for height and width of element
var edges = {
droppableRight: sortItem.offset.left + sortItem.el.width(),
@ -227,17 +225,15 @@ $.widget( "ui.sortable", $.ui.interaction, {
draggableRight: this.offset.left + this.dragEl.width(),
draggableBottom: this.offset.top + this.dragEl.height()
};
return sortItem.offset.left < edges.draggableRight &&
edges.droppableRight > this.offset.left &&
sortItem.offset.top < edges.draggableBottom &&
edges.droppableBottom > sortItem.offset.top;
},
_stop: function( event, pointerPosition ) {
var parent, next;
this._preparePosition( pointerPosition );
@ -257,11 +253,11 @@ $.widget( "ui.sortable", $.ui.interaction, {
else {
this.dragEl.css( 'position', '' );
}
// TODO: should same thing be done here as is done for position or is there better way altogether
this.dragEl.css( 'left', '' );
this.dragEl.css( 'top', '' );
this.placeholder.remove();
// Unset properties only needed during draggin/sorting