jQuery InputNumber Plugin Tests

', {'class':opts.wrapClass})); - this.$el.after( - $('', {'class':opts.upClass, 'title':opts.upTitle}), - $('', {'class':opts.downClass, 'title':opts.downTitle}) - ); + this.$el.after(this.$up, this.$down); this.$el.addClass(opts.inputClass); this.$wrap = this.$el.parent('.'+opts.wrapClass); this.bindEvents(); + + this.setValueTo(this.valueFrom(this.el), this.el); }, bindEvents: function() { @@ -81,28 +85,20 @@ self = this; this.$wrap - .delegate('a.' + opts.downClass, 'click', function(e) { + .delegate('button.' + opts.downClass, 'click', function(e) { self.down(); e.preventDefault(); }) - .delegate('a.' + opts.upClass, 'click', function(e) { + .delegate('button.' + opts.upClass, 'click', function(e) { self.up(); e.preventDefault(); }); $el - .on('change', function(e) { - var intVal = self.parseValue(e.currentTarget.value); - - if (e.currentTarget.value === '' || isNaN(intVal)) { - e.currentTarget.value = 0; - } - - if (!isNaN(intVal)) { - self.setValue(intVal, e.currentTarget); - } + .on('change.inputNumber', function(e) { + self.setValueTo(self.valueFrom(e.currentTarget), e.currentTarget); }) - .on('keypress', function(e) { + .on('keypress.inputNumber', function(e) { var keyCode = window.event ? e.keyCode : e.which; //codes for 0-9 @@ -113,20 +109,29 @@ } } }) - .bind('mousewheel', function(e, delta) { - var defVal = self.value(), - value = defVal + delta; - - self.setValue(self.parseValue(value), e.currentTarget); + .bind('mousewheel.inputNumber', function(e, delta) { + self.setValueTo(self.parseValue(self.valueFrom(e.currentTarget) + delta), e.currentTarget); }); }, parseValue: function(value) { - return this.options.decimal !== null ? parseFloat(value).toFixed(this.options.decimal) : parseFloat(value); + return this.options.decimal !== null ? + parseFloat(parseFloat(value).toFixed(this.options.decimal)) : + parseFloat(value); + }, + + valueFrom: function(target = this.el) { + var val = this.parseValue(target.value); + + if (isNaN(val)) { + return 0; + } + + return val; }, value: function() { - return this.parseValue(this.el.value) || 0; + return this.valueFrom(this.el); }, incValue: function() { @@ -139,9 +144,12 @@ return -- val; }, - setValue: function(value, el) { + setValueTo: function(value, el) { var opts = this.options; + this.$up.attr('disabled', !isNaN(opts.max) && value >= opts.max); + this.$down.attr('disabled', !isNaN(opts.min) && value <= opts.min); + if (value < opts.min) { el.value = opts.min; return; @@ -175,13 +183,13 @@ up: function() { var value = this.incValue(); - this.setValue(value, this.el); + this.setValueTo(value, this.el); }, down: function() { var value = this.decValue(); - this.setValue(value, this.el); + this.setValueTo(value, this.el); } }; diff --git a/jquery.mousewheel.js b/jquery.mousewheel.js index 9d65c71..acc1aca 100644 --- a/jquery.mousewheel.js +++ b/jquery.mousewheel.js @@ -1,117 +1,238 @@ -/*! Copyright (c) 2013 Brandon Aaron (http://brandonaaron.net) - * Licensed under the MIT License (LICENSE.txt). - * - * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers. - * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix. - * Thanks to: Seamus Leahy for adding deltaX and deltaY - * - * Version: 3.1.3 - * - * Requires: 1.2.2+ +/*! + * jQuery Mousewheel 3.1.13 + * Copyright OpenJS Foundation and other contributors */ -(function (factory) { - if ( typeof define === 'function' && define.amd ) { +( function( factory ) { + if ( typeof define === "function" && define.amd ) { + // AMD. Register as an anonymous module. - define(['jquery'], factory); - } else if (typeof exports === 'object') { + define( [ "jquery" ], factory ); + } else if ( typeof exports === "object" ) { + // Node/CommonJS style for Browserify module.exports = factory; } else { + // Browser globals - factory(jQuery); + factory( jQuery ); } -}(function ($) { +} )( function( $ ) { - var toFix = ['wheel', 'mousewheel', 'DOMMouseScroll', 'MozMousePixelScroll']; - var toBind = 'onwheel' in document || document.documentMode >= 9 ? ['wheel'] : ['mousewheel', 'DomMouseScroll', 'MozMousePixelScroll']; - var lowestDelta, lowestDeltaXY; + var toFix = [ "wheel", "mousewheel", "DOMMouseScroll", "MozMousePixelScroll" ], + toBind = ( "onwheel" in window.document || window.document.documentMode >= 9 ) ? + [ "wheel" ] : [ "mousewheel", "DomMouseScroll", "MozMousePixelScroll" ], + slice = Array.prototype.slice, + nullLowestDeltaTimeout, lowestDelta; if ( $.event.fixHooks ) { for ( var i = toFix.length; i; ) { - $.event.fixHooks[ toFix[--i] ] = $.event.mouseHooks; + $.event.fixHooks[ toFix[ --i ] ] = $.event.mouseHooks; } } - $.event.special.mousewheel = { + var special = $.event.special.mousewheel = { + version: "3.1.12", + setup: function() { if ( this.addEventListener ) { for ( var i = toBind.length; i; ) { - this.addEventListener( toBind[--i], handler, false ); + this.addEventListener( toBind[ --i ], handler, false ); } } else { this.onmousewheel = handler; } + + // Store the line height and page height for this particular element + $.data( this, "mousewheel-line-height", special.getLineHeight( this ) ); + $.data( this, "mousewheel-page-height", special.getPageHeight( this ) ); }, teardown: function() { if ( this.removeEventListener ) { for ( var i = toBind.length; i; ) { - this.removeEventListener( toBind[--i], handler, false ); + this.removeEventListener( toBind[ --i ], handler, false ); } } else { this.onmousewheel = null; } + + // Clean up the data we added to the element + $.removeData( this, "mousewheel-line-height" ); + $.removeData( this, "mousewheel-page-height" ); + }, + + getLineHeight: function( elem ) { + var $elem = $( elem ), + $parent = $elem[ "offsetParent" in $.fn ? "offsetParent" : "parent" ](); + if ( !$parent.length ) { + $parent = $( "body" ); + } + return parseInt( $parent.css( "fontSize" ), 10 ) || + parseInt( $elem.css( "fontSize" ), 10 ) || 16; + }, + + getPageHeight: function( elem ) { + return $( elem ).height(); + }, + + settings: { + adjustOldDeltas: true, // see shouldAdjustOldDeltas() below + normalizeOffset: true // calls getBoundingClientRect for each event } }; - $.fn.extend({ - mousewheel: function(fn) { - return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel"); + $.fn.extend( { + mousewheel: function( fn ) { + return fn ? this.on( "mousewheel", fn ) : this.trigger( "mousewheel" ); }, - unmousewheel: function(fn) { - return this.unbind("mousewheel", fn); + unmousewheel: function( fn ) { + return this.off( "mousewheel", fn ); } - }); + } ); - function handler(event) { - var orgEvent = event || window.event, - args = [].slice.call(arguments, 1), - delta = 0, - deltaX = 0, - deltaY = 0, - absDelta = 0, - absDeltaXY = 0, - fn; - event = $.event.fix(orgEvent); + function handler( event ) { + var orgEvent = event || window.event, + args = slice.call( arguments, 1 ), + delta = 0, + deltaX = 0, + deltaY = 0, + absDelta = 0; + event = $.event.fix( orgEvent ); event.type = "mousewheel"; // Old school scrollwheel delta - if ( orgEvent.wheelDelta ) { delta = orgEvent.wheelDelta; } - if ( orgEvent.detail ) { delta = orgEvent.detail * -1; } + if ( "detail" in orgEvent ) { + deltaY = orgEvent.detail * -1; + } + if ( "wheelDelta" in orgEvent ) { + deltaY = orgEvent.wheelDelta; + } + if ( "wheelDeltaY" in orgEvent ) { + deltaY = orgEvent.wheelDeltaY; + } + if ( "wheelDeltaX" in orgEvent ) { + deltaX = orgEvent.wheelDeltaX * -1; + } + + // Firefox < 17 horizontal scrolling related to DOMMouseScroll event + if ( "axis" in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) { + deltaX = deltaY * -1; + deltaY = 0; + } + + // Set delta to be deltaY or deltaX if deltaY is 0 for backwards compatabilitiy + delta = deltaY === 0 ? deltaX : deltaY; // New school wheel delta (wheel event) - if ( orgEvent.deltaY ) { + if ( "deltaY" in orgEvent ) { deltaY = orgEvent.deltaY * -1; delta = deltaY; } - if ( orgEvent.deltaX ) { + if ( "deltaX" in orgEvent ) { deltaX = orgEvent.deltaX; - delta = deltaX * -1; + if ( deltaY === 0 ) { + delta = deltaX * -1; + } + } + + // No change actually happened, no reason to go any further + if ( deltaY === 0 && deltaX === 0 ) { + return; + } + + // Need to convert lines and pages to pixels if we aren't already in pixels + // There are three delta modes: + // * deltaMode 0 is by pixels, nothing to do + // * deltaMode 1 is by lines + // * deltaMode 2 is by pages + if ( orgEvent.deltaMode === 1 ) { + var lineHeight = $.data( this, "mousewheel-line-height" ); + delta *= lineHeight; + deltaY *= lineHeight; + deltaX *= lineHeight; + } else if ( orgEvent.deltaMode === 2 ) { + var pageHeight = $.data( this, "mousewheel-page-height" ); + delta *= pageHeight; + deltaY *= pageHeight; + deltaX *= pageHeight; + } + + // Store lowest absolute delta to normalize the delta values + absDelta = Math.max( Math.abs( deltaY ), Math.abs( deltaX ) ); + + if ( !lowestDelta || absDelta < lowestDelta ) { + lowestDelta = absDelta; + + // Adjust older deltas if necessary + if ( shouldAdjustOldDeltas( orgEvent, absDelta ) ) { + lowestDelta /= 40; + } } - // Webkit - if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY; } - if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = orgEvent.wheelDeltaX * -1; } + // Adjust older deltas if necessary + if ( shouldAdjustOldDeltas( orgEvent, absDelta ) ) { - // Look for lowest delta to normalize the delta values - absDelta = Math.abs(delta); - if ( !lowestDelta || absDelta < lowestDelta ) { lowestDelta = absDelta; } - absDeltaXY = Math.max(Math.abs(deltaY), Math.abs(deltaX)); - if ( !lowestDeltaXY || absDeltaXY < lowestDeltaXY ) { lowestDeltaXY = absDeltaXY; } + // Divide all the things by 40! + delta /= 40; + deltaX /= 40; + deltaY /= 40; + } + + // Get a whole, normalized value for the deltas + delta = Math[ delta >= 1 ? "floor" : "ceil" ]( delta / lowestDelta ); + deltaX = Math[ deltaX >= 1 ? "floor" : "ceil" ]( deltaX / lowestDelta ); + deltaY = Math[ deltaY >= 1 ? "floor" : "ceil" ]( deltaY / lowestDelta ); + + // Normalise offsetX and offsetY properties + if ( special.settings.normalizeOffset && this.getBoundingClientRect ) { + var boundingRect = this.getBoundingClientRect(); + event.offsetX = event.clientX - boundingRect.left; + event.offsetY = event.clientY - boundingRect.top; + } + + // Add information to the event object + event.deltaX = deltaX; + event.deltaY = deltaY; + event.deltaFactor = lowestDelta; - // Get a whole value for the deltas - fn = delta > 0 ? 'floor' : 'ceil'; - delta = Math[fn](delta / lowestDelta); - deltaX = Math[fn](deltaX / lowestDeltaXY); - deltaY = Math[fn](deltaY / lowestDeltaXY); + // Go ahead and set deltaMode to 0 since we converted to pixels + // Although this is a little odd since we overwrite the deltaX/Y + // properties with normalized deltas. + event.deltaMode = 0; // Add event and delta to the front of the arguments - args.unshift(event, delta, deltaX, deltaY); + args.unshift( event, delta, deltaX, deltaY ); + + // Clearout lowestDelta after sometime to better + // handle multiple device types that give different + // a different lowestDelta + // Ex: trackpad = 3 and mouse wheel = 120 + if ( nullLowestDeltaTimeout ) { + window.clearTimeout( nullLowestDeltaTimeout ); + } + nullLowestDeltaTimeout = window.setTimeout( nullLowestDelta, 200 ); + + return ( $.event.dispatch || $.event.handle ).apply( this, args ); + } + + function nullLowestDelta() { + lowestDelta = null; + } - return ($.event.dispatch || $.event.handle).apply(this, args); + function shouldAdjustOldDeltas( orgEvent, absDelta ) { + + // If this is an older event and the delta is divisable by 120, + // then we are assuming that the browser is treating this as an + // older mouse wheel event and that we should divide the deltas + // by 40 to try and get a more usable deltaFactor. + // Side note, this actually impacts the reported scroll distance + // in older browsers and can cause scrolling to be slower than native. + // Turn this off by setting $.event.special.mousewheel.settings.adjustOldDeltas to false. + return special.settings.adjustOldDeltas && orgEvent.type === "mousewheel" && + absDelta % 120 === 0; } -})); +} ); \ No newline at end of file diff --git a/test/test.js b/test/test.js index fb28025..d278aa5 100644 --- a/test/test.js +++ b/test/test.js @@ -36,11 +36,13 @@ QUnit.test('Min and max constraints', function(assert) { this.input.trigger('change'); assert.equal(this.input.val(), 100, 'Value capped at maximum'); + assert.equal(this.input.data('inputNumber').$up.attr('disabled'), 'disabled', 'Up button disabled'); this.input.val(-50); this.input.trigger('change'); assert.equal(this.input.val(), 0, 'Value capped at minimum'); + assert.equal(this.input.data('inputNumber').$down.attr('disabled'), 'disabled', 'Down button disabled'); }); QUnit.test('Decimal precision', function(assert) { From 97a90e4e5a74c7e124ead045be03848452bc9cab Mon Sep 17 00:00:00 2001 From: Nikolay Kostyurin Date: Mon, 2 Dec 2024 01:24:19 +0200 Subject: [PATCH 06/11] fix: lock file --- package-lock.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index ef52e4f..f3f4636 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,16 +17,16 @@ "@semantic-release/release-notes-generator": "^12.1.0", "jquery": "3.7.1", "jquery-jsdom": "1.0.0", - "karma": "^6.4.4", - "karma-chrome-launcher": "^3.2.0", - "karma-coverage": "^2.2.1", - "karma-jquery": "^0.2.4", - "karma-qunit": "^4.2.1", - "karma-webpack": "^5.0.1", - "qunit": "^2.20.0", - "semantic-release": "^24.2.0", - "webpack": "^5.96.1", - "webpack-cli": "^5.1.4" + "karma": "6.4.4", + "karma-chrome-launcher": "3.2.0", + "karma-coverage": "2.2.1", + "karma-jquery": "0.2.4", + "karma-qunit": "4.2.1", + "karma-webpack": "5.0.1", + "qunit": "2.20.0", + "semantic-release": "24.2.0", + "webpack": "5.96.1", + "webpack-cli": "5.1.4" }, "peerDependencies": { "jquery": ">=1.7" @@ -8997,9 +8997,9 @@ "license": "MIT" }, "node_modules/qunit": { - "version": "2.22.0", - "resolved": "https://registry.npmjs.org/qunit/-/qunit-2.22.0.tgz", - "integrity": "sha512-wPYvAvpjTL3zlUeyCX75T8gfZfdVXZa8y1EVkGe/XZNORIsCH/WI2X8R2KlemT921X9EKSZUL6CLGSPC7Ks08g==", + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/qunit/-/qunit-2.20.0.tgz", + "integrity": "sha512-N8Fp1J55waE+QG1KwX2LOyqulZUToRrrPBqDOfYfuAMkEglFL15uwvmH1P4Tq/omQ/mGbBI8PEB3PhIfvUb+jg==", "dev": true, "license": "MIT", "dependencies": { From 30fef142a9bec0959aa7bc53a795aa2f0a1d2cc0 Mon Sep 17 00:00:00 2001 From: Nikolay Kostyurin Date: Mon, 2 Dec 2024 01:37:00 +0200 Subject: [PATCH 07/11] fix: publish --- .github/workflows/release.yml | 8 ++++---- package.json | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1f4c224..2c5a5cf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,10 +10,10 @@ jobs: name: Release runs-on: ubuntu-latest permissions: - contents: write - issues: write - pull-requests: write - id-token: write # This enables provenance + contents: write # to be able to publish a GitHub release + issues: write # to be able to comment on released issues + pull-requests: write # to be able to comment on released pull requests + id-token: write # to enable use of OIDC for npm provenance steps: - name: Checkout diff --git a/package.json b/package.json index 955375f..4655c37 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,8 @@ "license": "MIT", "publishConfig": { "access": "public", + "registry": "https://registry.npmjs.org/", + "tag": "latest", "provenance": true }, "files": [ From b772618e51b39bcecc7709105fecb48b3d69b95a Mon Sep 17 00:00:00 2001 From: Nikolay Kostyurin Date: Mon, 2 Dec 2024 01:51:03 +0200 Subject: [PATCH 08/11] fix: npmrc --- .npmrc | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..41d6205 --- /dev/null +++ b/.npmrc @@ -0,0 +1,2 @@ +registry=https://registry.npmjs.org/ +provenance=true \ No newline at end of file From b1bb93d984a3306485b8ec896e830e44920b492c Mon Sep 17 00:00:00 2001 From: Nikolay Kostyurin Date: Mon, 2 Dec 2024 01:53:36 +0200 Subject: [PATCH 09/11] fix: validate npm token --- .github/workflows/release.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2c5a5cf..cb8a256 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,6 +34,15 @@ jobs: - name: Verify the integrity of provenance attestations and registry signatures run: npm audit signatures + - name: Validate NPM_TOKEN + env: + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + run: | + if [ -z "$NPM_TOKEN" ]; then + echo "NPM_TOKEN is not set" + exit 1 + fi + - name: Release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 8ec7121f6e5e8726e813bc5cfc02f433ad14134c Mon Sep 17 00:00:00 2001 From: Nikolay Kostyurin Date: Mon, 2 Dec 2024 02:04:36 +0200 Subject: [PATCH 10/11] chore: publish 0.1.4 --- .npmrc | 1 - inputnumber.jquery.json | 2 +- jquery.inputNumber.js | 2 +- package.json | 9 ++++----- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.npmrc b/.npmrc index 41d6205..214c29d 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1 @@ registry=https://registry.npmjs.org/ -provenance=true \ No newline at end of file diff --git a/inputnumber.jquery.json b/inputnumber.jquery.json index dbb9695..acfeff1 100644 --- a/inputnumber.jquery.json +++ b/inputnumber.jquery.json @@ -1,6 +1,6 @@ { "name": "inputnumber", - "version": "0.1.3", + "version": "0.1.4", "title": "jQuery HTML5 like input number", "author": { "name": "Nikolay Kostyurn", diff --git a/jquery.inputNumber.js b/jquery.inputNumber.js index e545df0..2acf187 100644 --- a/jquery.inputNumber.js +++ b/jquery.inputNumber.js @@ -1,6 +1,6 @@ /** * @author Nikolay Kostyurin - * @version 0.1.3 HTML5 Like enumerable input + * @version 0.1.4 HTML5 Like enumerable input */ // Uses CommonJS, AMD or browser globals to create a jQuery plugin. diff --git a/package.json b/package.json index 4655c37..d0c3076 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jquery-inputnumber", - "version": "0.1.3", + "version": "0.1.4", "readme": "README.md", "description": "Expand your default text input by number input features.", "main": "jquery.inputNumber.js", @@ -51,18 +51,17 @@ ], "repository": { "type": "git", - "url": "https://github.com/JiLiZART/jquery.inputNumber.git" + "url": "git+https://github.com/JiLiZART/jquery.inputNumber.git" }, "license": "MIT", "publishConfig": { "access": "public", - "registry": "https://registry.npmjs.org/", - "tag": "latest", - "provenance": true + "registry": "https://registry.npmjs.org/" }, "files": [ "jquery.inputNumber.js", "inputNumber.css", + "inputNumber.styl", "LICENSE.md", "README.md" ] From 3dafd653bec9c0cd7b080320c6f319e4189ea4c8 Mon Sep 17 00:00:00 2001 From: Nikolay Kostyurin Date: Mon, 2 Dec 2024 02:05:22 +0200 Subject: [PATCH 11/11] chore: provenance --- .npmrc | 1 + package.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.npmrc b/.npmrc index 214c29d..41d6205 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1,2 @@ registry=https://registry.npmjs.org/ +provenance=true \ No newline at end of file diff --git a/package.json b/package.json index d0c3076..d42c3a5 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,8 @@ "license": "MIT", "publishConfig": { "access": "public", - "registry": "https://registry.npmjs.org/" + "registry": "https://registry.npmjs.org/", + "provenance": true }, "files": [ "jquery.inputNumber.js",