diff options
author | Alexander Schmitz <arschmitz@gmail.com> | 2015-08-21 00:10:45 -0400 |
---|---|---|
committer | Alexander Schmitz <arschmitz@gmail.com> | 2015-08-21 08:06:23 -0400 |
commit | f43311da932d8ec16ad91c14afefc84cfb810797 (patch) | |
tree | 07151d6784fabc07e2973206c069c2063d8eee3d | |
parent | 3b99bf4cc848ee5faf5f3f0d6483f2fa03e5f969 (diff) | |
download | jquery-ui-f43311da932d8ec16ad91c14afefc84cfb810797.tar.gz jquery-ui-f43311da932d8ec16ad91c14afefc84cfb810797.zip |
Droppable: Style updates
Ref #14246
Ref gh-1588
-rw-r--r-- | demos/droppable/photo-manager.html | 16 | ||||
-rw-r--r-- | tests/unit/droppable/common-deprecated.js | 2 | ||||
-rw-r--r-- | tests/unit/droppable/common.js | 2 | ||||
-rw-r--r-- | tests/unit/droppable/options.js | 4 | ||||
-rw-r--r-- | ui/widgets/droppable.js | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/demos/droppable/photo-manager.html b/demos/droppable/photo-manager.html index 2b324c1e9..d576e6524 100644 --- a/demos/droppable/photo-manager.html +++ b/demos/droppable/photo-manager.html @@ -22,11 +22,11 @@ <script src="../../external/requirejs/require.js"></script> <script src="../bootstrap.js" data-modules="dialog"> - // there's the gallery and the trash + // There's the gallery and the trash var $gallery = $( "#gallery" ), $trash = $( "#trash" ); - // let the gallery items be draggable + // Let the gallery items be draggable $( "li", $gallery ).draggable({ cancel: "a.ui-icon", // clicking an icon won't initiate dragging revert: "invalid", // when not dropped, the item will revert back to its initial position @@ -35,7 +35,7 @@ cursor: "move" }); - // let the trash be droppable, accepting the gallery items + // Let the trash be droppable, accepting the gallery items $trash.droppable({ accept: "#gallery > li", classes: { @@ -46,7 +46,7 @@ } }); - // let the gallery be droppable as well, accepting items from the trash + // Let the gallery be droppable as well, accepting items from the trash $gallery.droppable({ accept: "#trash li", classes: { @@ -57,7 +57,7 @@ } }); - // image deletion function + // Image deletion function var recycle_icon = "<a href='link/to/recycle/script/when/we/have/js/off' title='Recycle this image' class='ui-icon ui-icon-refresh'>Recycle image</a>"; function deleteImage( $item ) { $item.fadeOut(function() { @@ -75,7 +75,7 @@ }); } - // image recycle function + // Image recycle function var trash_icon = "<a href='link/to/trash/script/when/we/have/js/off' title='Delete this image' class='ui-icon ui-icon-trash'>Delete image</a>"; function recycleImage( $item ) { $item.fadeOut(function() { @@ -93,7 +93,7 @@ }); } - // image preview function, demonstrating the ui.dialog used as a modal window + // Image preview function, demonstrating the ui.dialog used as a modal window function viewLargerImage( $link ) { var src = $link.attr( "href" ), title = $link.siblings( "img" ).attr( "alt" ), @@ -114,7 +114,7 @@ } } - // resolve the icons behavior with event delegation + // Resolve the icons behavior with event delegation $( "ul.gallery > li" ).on( "click", function( event ) { var $item = $( this ), $target = $( event.target ); diff --git a/tests/unit/droppable/common-deprecated.js b/tests/unit/droppable/common-deprecated.js index e9fdc69cc..ecbc9b1a1 100644 --- a/tests/unit/droppable/common-deprecated.js +++ b/tests/unit/droppable/common-deprecated.js @@ -15,7 +15,7 @@ common.testWidget( "droppable", { scope: "default", tolerance: "intersect", - // callbacks + // Callbacks activate: null, create: null, deactivate: null, diff --git a/tests/unit/droppable/common.js b/tests/unit/droppable/common.js index d3bffc67b..5d0e55d6f 100644 --- a/tests/unit/droppable/common.js +++ b/tests/unit/droppable/common.js @@ -13,7 +13,7 @@ common.testWidget( "droppable", { scope: "default", tolerance: "intersect", - // callbacks + // Callbacks activate: null, create: null, deactivate: null, diff --git a/tests/unit/droppable/options.js b/tests/unit/droppable/options.js index 2fdf483d2..c2035ce8c 100644 --- a/tests/unit/droppable/options.js +++ b/tests/unit/droppable/options.js @@ -114,7 +114,7 @@ test( "tolerance, intersect", function() { height: 10, position: "absolute", - // http://bugs.jqueryui.com/ticket/6876 + // Http://bugs.jqueryui.com/ticket/6876 // Droppable: droppable region is offset by draggables margin marginTop: 3, marginLeft: 3 @@ -183,7 +183,7 @@ test( "tolerance, pointer", function() { }); }); - // http://bugs.jqueryui.com/ticket/4977 - tolerance, pointer - bug when pointer outside draggable + // Http://bugs.jqueryui.com/ticket/4977 - tolerance, pointer - bug when pointer outside draggable draggable.css({ top: 0, left: 0 }).draggable( "option", "axis", "x" ); droppable.css({ top: 15, left: 15 }); diff --git a/ui/widgets/droppable.js b/ui/widgets/droppable.js index 3a8bd7109..6ba8d8c80 100644 --- a/ui/widgets/droppable.js +++ b/ui/widgets/droppable.js @@ -41,7 +41,7 @@ $.widget( "ui.droppable", { scope: "default", tolerance: "intersect", - // callbacks + // Callbacks activate: null, deactivate: null, drop: null, @@ -388,7 +388,7 @@ $.ui.ddmanager = { } } - // we just moved into a greedy child + // We just moved into a greedy child if ( parentInstance && c === "isover" ) { parentInstance.isover = false; parentInstance.isout = true; @@ -399,7 +399,7 @@ $.ui.ddmanager = { this[c === "isout" ? "isover" : "isout"] = false; this[c === "isover" ? "_over" : "_out"].call( this, event ); - // we just moved out of a greedy child + // We just moved out of a greedy child if ( parentInstance && c === "isout" ) { parentInstance.isout = false; parentInstance.isover = true; |