Skip to content

Commit

Permalink
remove is-pointer-down class
Browse files Browse the repository at this point in the history
add tests for is-dragging and is-pointer-down classes
  • Loading branch information
desandro committed Mar 11, 2015
1 parent 74e096a commit b75bff3
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
1 change: 1 addition & 0 deletions draggabilly.js
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,7 @@ Draggabilly.prototype.containDrag = function( axis, drag, grid ) {
* @param {Event or Touch} pointer
*/
Draggabilly.prototype.pointerUp = function( event, pointer ) {
classie.remove( this.element, 'is-pointer-down' );
this.dispatchEvent( 'pointerUp', event, [ pointer ] );
this._dragPointerUp( event, pointer );
};
Expand Down
6 changes: 5 additions & 1 deletion test/unit/basics.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ test( 'init', function( assert ) {
'use strict';

var transformProperty = getStyleProperty('transform');
assert.expect( 25 + ( transformProperty ? 1 : 0 ) );
assert.expect( 29 + ( transformProperty ? 1 : 0 ) );
var done = assert.async();

var testElem = document.querySelector('.test--basics');
Expand All @@ -21,6 +21,7 @@ test( 'init', function( assert ) {
didPointerDown = true;
equal( typeof event, 'object', 'pointerDown event argument' );
ok( pointer.pageX, 'pointerDown pageX' );
ok( classie.has( draggieElem, 'is-pointer-down' ), 'is-pointer-down class added' );
});

draggie.once( 'pointerMove', function( event, pointer, moveVector ) {
Expand All @@ -35,12 +36,14 @@ test( 'init', function( assert ) {
didPointerUp = true;
equal( typeof event, 'object', 'pointerUp event argument' );
ok( pointer.pageX, 'pointerUp pageX' );
ok( !classie.has( draggieElem, 'is-pointer-down' ), 'is-pointer-down class removed' );
});

draggie.once( 'dragStart', function( evnet, pointer ) {
didDragStart = true;
equal( typeof event, 'object', 'didDragStart event argument' );
equal( typeof pointer.pageX, 'number', 'didDragStart pageX' );
ok( classie.has( draggieElem, 'is-dragging' ), 'is-dragging class added' );
});

draggie.once( 'dragMove', function( event, pointer, moveVector ) {
Expand All @@ -55,6 +58,7 @@ test( 'init', function( assert ) {
didDragEnd = true;
equal( typeof event, 'object', 'dragEnd event argument' );
ok( pointer.pageX, 'dragEnd pageX' );
ok( !classie.has( draggieElem, 'is-dragging' ), 'is-dragging class removed' );

ok( didPointerDown, 'didPointerDown' );
ok( didPointerMove, 'didPointerMove' );
Expand Down
8 changes: 5 additions & 3 deletions test/unit/jquery-basics.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ test( 'init', function( assert ) {
'use strict';

var transformProperty = getStyleProperty('transform');
assert.expect( 25 + ( transformProperty ? 1 : 0 ) );
assert.expect( 29 + ( transformProperty ? 1 : 0 ) );
var done = assert.async();



var $test = $('.test--basics').addClass('running');
var $h2 = $test.find('h2').text('Drag this element');

Expand All @@ -25,6 +23,7 @@ test( 'init', function( assert ) {
didPointerDown = true;
equal( typeof event, 'object', 'pointerDown event argument' );
ok( pointer.pageX, 'pointerDown pageX' );
ok( $draggie.hasClass('is-pointer-down'), 'is-pointer-down class added' );
});

$draggie.one( 'pointerMove', function( event, pointer, moveVector ) {
Expand All @@ -39,12 +38,14 @@ test( 'init', function( assert ) {
didPointerUp = true;
equal( typeof event, 'object', 'pointerUp event argument' );
ok( pointer.pageX, 'pointerUp pageX' );
ok( !$draggie.hasClass('is-pointer-down'), 'is-pointer-down class removed' );
});

$draggie.one( 'dragStart', function( evnet, pointer ) {
didDragStart = true;
equal( typeof event, 'object', 'didDragStart event argument' );
equal( typeof pointer.pageX, 'number', 'didDragStart pageX' );
ok( $draggie.hasClass('is-dragging'), 'is-dragging class added' );
});

$draggie.one( 'dragMove', function( event, pointer, moveVector ) {
Expand All @@ -59,6 +60,7 @@ test( 'init', function( assert ) {
didDragEnd = true;
equal( typeof event, 'object', 'dragEnd event argument' );
ok( pointer.pageX, 'dragEnd pageX' );
ok( !$draggie.hasClass('is-dragging'), 'is-dragging class removed' );

ok( didPointerDown, 'didPointerDown' );
ok( didPointerMove, 'didPointerMove' );
Expand Down

0 comments on commit b75bff3

Please sign in to comment.