From 5b061ef69084d813c8bab8aa10254d0befb6fb22 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 6 Aug 2020 19:00:50 +0100 Subject: [PATCH] Move jquery.simulate to be a yarn managed asset --- Vendorfile | 1 - app/assets/javascripts/index/history.js | 2 +- app/assets/javascripts/index/query.js | 2 +- app/assets/javascripts/index/search.js | 2 +- package.json | 3 +- vendor/assets/jquery/jquery.simulate.js | 330 ------------------------ yarn.lock | 5 + 7 files changed, 10 insertions(+), 335 deletions(-) delete mode 100644 vendor/assets/jquery/jquery.simulate.js diff --git a/Vendorfile b/Vendorfile index a731e5f20..2bc20b76c 100644 --- a/Vendorfile +++ b/Vendorfile @@ -2,7 +2,6 @@ folder 'vendor/assets' do folder 'jquery' do file 'jquery.cookie.js', 'https://raw.githubusercontent.com/carhartl/jquery-cookie/master/src/jquery.cookie.js' file 'jquery.throttle-debounce.js', 'https://raw.githubusercontent.com/cowboy/jquery-throttle-debounce/v1.1/jquery.ba-throttle-debounce.js' - file 'jquery.simulate.js', 'https://raw.githubusercontent.com/jquery/jquery-simulate/1.0.0/jquery.simulate.js' end folder 'leaflet' do diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js index ddb454c13..7f0fdf848 100644 --- a/app/assets/javascripts/index/history.js +++ b/app/assets/javascripts/index/history.js @@ -1,4 +1,4 @@ -//= require jquery.simulate +//= require jquery-simulate/jquery.simulate OSM.History = function (map) { var page = {}; diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index 7d02760ce..ad983b5d5 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -1,4 +1,4 @@ -//= require jquery.simulate +//= require jquery-simulate/jquery.simulate //= require querystring OSM.Query = function (map) { diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js index 9ed243466..3cd546218 100644 --- a/app/assets/javascripts/index/search.js +++ b/app/assets/javascripts/index/search.js @@ -1,4 +1,4 @@ -//= require jquery.simulate +//= require jquery-simulate/jquery.simulate //= require querystring OSM.Search = function (map) { diff --git a/package.json b/package.json index d84e5d27f..a9302b213 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,8 @@ "private": true, "dependencies": { "bs-custom-file-input": "^1.3.4", - "html5shiv": "^3.7.3" + "html5shiv": "^3.7.3", + "jquery-simulate": "^1.0.2" }, "devDependencies": { "eslint": "^7.3.1" diff --git a/vendor/assets/jquery/jquery.simulate.js b/vendor/assets/jquery/jquery.simulate.js deleted file mode 100644 index 4a96cc310..000000000 --- a/vendor/assets/jquery/jquery.simulate.js +++ /dev/null @@ -1,330 +0,0 @@ - /*! - * jQuery Simulate v1.0.0 - simulate browser mouse and keyboard events - * https://github.com/jquery/jquery-simulate - * - * Copyright 2012 jQuery Foundation and other contributors - * Released under the MIT license. - * http://jquery.org/license - * - * Date: 2014-08-22 - */ - -;(function( $, undefined ) { - -var rkeyEvent = /^key/, - rmouseEvent = /^(?:mouse|contextmenu)|click/; - -$.fn.simulate = function( type, options ) { - return this.each(function() { - new $.simulate( this, type, options ); - }); -}; - -$.simulate = function( elem, type, options ) { - var method = $.camelCase( "simulate-" + type ); - - this.target = elem; - this.options = options; - - if ( this[ method ] ) { - this[ method ](); - } else { - this.simulateEvent( elem, type, options ); - } -}; - -$.extend( $.simulate, { - - keyCode: { - BACKSPACE: 8, - COMMA: 188, - DELETE: 46, - DOWN: 40, - END: 35, - ENTER: 13, - ESCAPE: 27, - HOME: 36, - LEFT: 37, - NUMPAD_ADD: 107, - NUMPAD_DECIMAL: 110, - NUMPAD_DIVIDE: 111, - NUMPAD_ENTER: 108, - NUMPAD_MULTIPLY: 106, - NUMPAD_SUBTRACT: 109, - PAGE_DOWN: 34, - PAGE_UP: 33, - PERIOD: 190, - RIGHT: 39, - SPACE: 32, - TAB: 9, - UP: 38 - }, - - buttonCode: { - LEFT: 0, - MIDDLE: 1, - RIGHT: 2 - } -}); - -$.extend( $.simulate.prototype, { - - simulateEvent: function( elem, type, options ) { - var event = this.createEvent( type, options ); - this.dispatchEvent( elem, type, event, options ); - }, - - createEvent: function( type, options ) { - if ( rkeyEvent.test( type ) ) { - return this.keyEvent( type, options ); - } - - if ( rmouseEvent.test( type ) ) { - return this.mouseEvent( type, options ); - } - }, - - mouseEvent: function( type, options ) { - var event, eventDoc, doc, body; - options = $.extend({ - bubbles: true, - cancelable: (type !== "mousemove"), - view: window, - detail: 0, - screenX: 0, - screenY: 0, - clientX: 1, - clientY: 1, - ctrlKey: false, - altKey: false, - shiftKey: false, - metaKey: false, - button: 0, - relatedTarget: undefined - }, options ); - - if ( document.createEvent ) { - event = document.createEvent( "MouseEvents" ); - event.initMouseEvent( type, options.bubbles, options.cancelable, - options.view, options.detail, - options.screenX, options.screenY, options.clientX, options.clientY, - options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, - options.button, options.relatedTarget || document.body.parentNode ); - - // IE 9+ creates events with pageX and pageY set to 0. - // Trying to modify the properties throws an error, - // so we define getters to return the correct values. - if ( event.pageX === 0 && event.pageY === 0 && Object.defineProperty ) { - eventDoc = event.relatedTarget.ownerDocument || document; - doc = eventDoc.documentElement; - body = eventDoc.body; - - Object.defineProperty( event, "pageX", { - get: function() { - return options.clientX + - ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); - } - }); - Object.defineProperty( event, "pageY", { - get: function() { - return options.clientY + - ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - - ( doc && doc.clientTop || body && body.clientTop || 0 ); - } - }); - } - } else if ( document.createEventObject ) { - event = document.createEventObject(); - $.extend( event, options ); - // standards event.button uses constants defined here: http://msdn.microsoft.com/en-us/library/ie/ff974877(v=vs.85).aspx - // old IE event.button uses constants defined here: http://msdn.microsoft.com/en-us/library/ie/ms533544(v=vs.85).aspx - // so we actually need to map the standard back to oldIE - event.button = { - 0: 1, - 1: 4, - 2: 2 - }[ event.button ] || ( event.button === -1 ? 0 : event.button ); - } - - return event; - }, - - keyEvent: function( type, options ) { - var event; - options = $.extend({ - bubbles: true, - cancelable: true, - view: window, - ctrlKey: false, - altKey: false, - shiftKey: false, - metaKey: false, - keyCode: 0, - charCode: undefined - }, options ); - - if ( document.createEvent ) { - try { - event = document.createEvent( "KeyEvents" ); - event.initKeyEvent( type, options.bubbles, options.cancelable, options.view, - options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, - options.keyCode, options.charCode ); - // initKeyEvent throws an exception in WebKit - // see: http://stackoverflow.com/questions/6406784/initkeyevent-keypress-only-works-in-firefox-need-a-cross-browser-solution - // and also https://bugs.webkit.org/show_bug.cgi?id=13368 - // fall back to a generic event until we decide to implement initKeyboardEvent - } catch( err ) { - event = document.createEvent( "Events" ); - event.initEvent( type, options.bubbles, options.cancelable ); - $.extend( event, { - view: options.view, - ctrlKey: options.ctrlKey, - altKey: options.altKey, - shiftKey: options.shiftKey, - metaKey: options.metaKey, - keyCode: options.keyCode, - charCode: options.charCode - }); - } - } else if ( document.createEventObject ) { - event = document.createEventObject(); - $.extend( event, options ); - } - - if ( !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() ) || (({}).toString.call( window.opera ) === "[object Opera]") ) { - event.keyCode = (options.charCode > 0) ? options.charCode : options.keyCode; - event.charCode = undefined; - } - - return event; - }, - - dispatchEvent: function( elem, type, event ) { - if ( elem[ type ] ) { - elem[ type ](); - } else if ( elem.dispatchEvent ) { - elem.dispatchEvent( event ); - } else if ( elem.fireEvent ) { - elem.fireEvent( "on" + type, event ); - } - }, - - simulateFocus: function() { - var focusinEvent, - triggered = false, - element = $( this.target ); - - function trigger() { - triggered = true; - } - - element.bind( "focus", trigger ); - element[ 0 ].focus(); - - if ( !triggered ) { - focusinEvent = $.Event( "focusin" ); - focusinEvent.preventDefault(); - element.trigger( focusinEvent ); - element.triggerHandler( "focus" ); - } - element.unbind( "focus", trigger ); - }, - - simulateBlur: function() { - var focusoutEvent, - triggered = false, - element = $( this.target ); - - function trigger() { - triggered = true; - } - - element.bind( "blur", trigger ); - element[ 0 ].blur(); - - // blur events are async in IE - setTimeout(function() { - // IE won't let the blur occur if the window is inactive - if ( element[ 0 ].ownerDocument.activeElement === element[ 0 ] ) { - element[ 0 ].ownerDocument.body.focus(); - } - - // Firefox won't trigger events if the window is inactive - // IE doesn't trigger events if we had to manually focus the body - if ( !triggered ) { - focusoutEvent = $.Event( "focusout" ); - focusoutEvent.preventDefault(); - element.trigger( focusoutEvent ); - element.triggerHandler( "blur" ); - } - element.unbind( "blur", trigger ); - }, 1 ); - } -}); - - - -/** complex events **/ - -function findCenter( elem ) { - var offset, - document = $( elem.ownerDocument ); - elem = $( elem ); - offset = elem.offset(); - - return { - x: offset.left + elem.outerWidth() / 2 - document.scrollLeft(), - y: offset.top + elem.outerHeight() / 2 - document.scrollTop() - }; -} - -function findCorner( elem ) { - var offset, - document = $( elem.ownerDocument ); - elem = $( elem ); - offset = elem.offset(); - - return { - x: offset.left - document.scrollLeft(), - y: offset.top - document.scrollTop() - }; -} - -$.extend( $.simulate.prototype, { - simulateDrag: function() { - var i = 0, - target = this.target, - options = this.options, - center = options.handle === "corner" ? findCorner( target ) : findCenter( target ), - x = Math.floor( center.x ), - y = Math.floor( center.y ), - coord = { clientX: x, clientY: y }, - dx = options.dx || ( options.x !== undefined ? options.x - x : 0 ), - dy = options.dy || ( options.y !== undefined ? options.y - y : 0 ), - moves = options.moves || 3; - - this.simulateEvent( target, "mousedown", coord ); - - for ( ; i < moves ; i++ ) { - x += dx / moves; - y += dy / moves; - - coord = { - clientX: Math.round( x ), - clientY: Math.round( y ) - }; - - this.simulateEvent( target.ownerDocument, "mousemove", coord ); - } - - if ( $.contains( document, target ) ) { - this.simulateEvent( target, "mouseup", coord ); - this.simulateEvent( target, "click", coord ); - } else { - this.simulateEvent( document, "mouseup", coord ); - } - } -}); - -})( jQuery ); diff --git a/yarn.lock b/yarn.lock index 5bc00168f..e075ea47b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -444,6 +444,11 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= +jquery-simulate@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/jquery-simulate/-/jquery-simulate-1.0.2.tgz#2174b859b75123a0ac6d8ab3a9a6fb4ad7e82898" + integrity sha512-Bq610fSrwTwvH5d06z5oskYaX/79s0BNrKiJZjZOiXRib3iL4ZkSn/wvLwzhf3P9KeXCEpk9wlIaGui/1arOpQ== + js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" -- 2.43.2