From e8e347f0e6dfbee43d52686a21bd8caba7ed8d84 Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Mon, 25 Mar 2019 14:45:36 +0200 Subject: [PATCH 1/8] Back to devel --- docs/HISTORY.txt | 3 +++ eea/jquery/version.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index a6ba9b7..b0bfc3f 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,6 +1,9 @@ Changelog ========= +11.2-dev0 - (unreleased) +--------------------- + 11.1 - (2019-03-25) --------------------- * Bug fix: fixed jquery.galleryview behavior when more than 1 gallery is added diff --git a/eea/jquery/version.txt b/eea/jquery/version.txt index ef32e32..678fbef 100644 --- a/eea/jquery/version.txt +++ b/eea/jquery/version.txt @@ -1 +1 @@ -11.1 +11.2-dev0 From 92f9c3091119b113b96f028ec55a890952085fc9 Mon Sep 17 00:00:00 2001 From: David Ichim Date: Mon, 24 Feb 2020 18:51:01 +0200 Subject: [PATCH 2/8] Refs #105112 replaced handle.call with dispatch.call as handle is removed in newer versions of jQuery: - https://stackoverflow.com/questions/17098340/jquery-event-handle-is-undocumented-and-deprecated --- eea/jquery/plugins/slickgrid/slick.grid.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eea/jquery/plugins/slickgrid/slick.grid.js b/eea/jquery/plugins/slickgrid/slick.grid.js index 2474691..84dab6f 100644 --- a/eea/jquery/plugins/slickgrid/slick.grid.js +++ b/eea/jquery/plugins/slickgrid/slick.grid.js @@ -3,7 +3,7 @@ * Copyright (c) 2010 Three Dub Media - http://threedubmedia.com * Open Source MIT License - http://threedubmedia.com/code/license */ -;(function(f){f.fn.drag=function(b,a,d){var e=typeof b=="string"?b:"",k=f.isFunction(b)?b:f.isFunction(a)?a:null;if(e.indexOf("drag")!==0)e="drag"+e;d=(b==k?a:d)||{};return k?this.bind(e,d,k):this.trigger(e)};var i=f.event,h=i.special,c=h.drag={defaults:{which:1,distance:0,not:":input",handle:null,relative:false,drop:true,click:false},datakey:"dragdata",livekey:"livedrag",add:function(b){var a=f.data(this,c.datakey),d=b.data||{};a.related+=1;if(!a.live&&b.selector){a.live=true;i.add(this,"draginit."+ c.livekey,c.delegate)}f.each(c.defaults,function(e){if(d[e]!==undefined)a[e]=d[e]})},remove:function(){f.data(this,c.datakey).related-=1},setup:function(){if(!f.data(this,c.datakey)){var b=f.extend({related:0},c.defaults);f.data(this,c.datakey,b);i.add(this,"mousedown",c.init,b);this.attachEvent&&this.attachEvent("ondragstart",c.dontstart)}},teardown:function(){if(!f.data(this,c.datakey).related){f.removeData(this,c.datakey);i.remove(this,"mousedown",c.init);i.remove(this,"draginit",c.delegate);c.textselect(true); this.detachEvent&&this.detachEvent("ondragstart",c.dontstart)}},init:function(b){var a=b.data,d;if(!(a.which>0&&b.which!=a.which))if(!f(b.target).is(a.not))if(!(a.handle&&!f(b.target).closest(a.handle,b.currentTarget).length)){a.propagates=1;a.interactions=[c.interaction(this,a)];a.target=b.target;a.pageX=b.pageX;a.pageY=b.pageY;a.dragging=null;d=c.hijack(b,"draginit",a);if(a.propagates){if((d=c.flatten(d))&&d.length){a.interactions=[];f.each(d,function(){a.interactions.push(c.interaction(this,a))})}a.propagates= a.interactions.length;a.drop!==false&&h.drop&&h.drop.handler(b,a);c.textselect(false);i.add(document,"mousemove mouseup",c.handler,a);return false}}},interaction:function(b,a){return{drag:b,callback:new c.callback,droppable:[],offset:f(b)[a.relative?"position":"offset"]()||{top:0,left:0}}},handler:function(b){var a=b.data;switch(b.type){case !a.dragging&&"mousemove":if(Math.pow(b.pageX-a.pageX,2)+Math.pow(b.pageY-a.pageY,2)0&&b.which!=a.which))if(!f(b.target).is(a.not))if(!(a.handle&&!f(b.target).closest(a.handle,b.currentTarget).length)){a.propagates=1;a.interactions=[c.interaction(this,a)];a.target=b.target;a.pageX=b.pageX;a.pageY=b.pageY;a.dragging=null;d=c.hijack(b,"draginit",a);if(a.propagates){if((d=c.flatten(d))&&d.length){a.interactions=[];f.each(d,function(){a.interactions.push(c.interaction(this,a))})}a.propagates= a.interactions.length;a.drop!==false&&h.drop&&h.drop.handler(b,a);c.textselect(false);i.add(document,"mousemove mouseup",c.handler,a);return false}}},interaction:function(b,a){return{drag:b,callback:new c.callback,droppable:[],offset:f(b)[a.relative?"position":"offset"]()||{top:0,left:0}}},handler:function(b){var a=b.data;switch(b.type){case !a.dragging&&"mousemove":if(Math.pow(b.pageX-a.pageX,2)+Math.pow(b.pageY-a.pageY,2) Date: Fri, 28 Feb 2020 18:21:28 +0200 Subject: [PATCH 3/8] [ichim-david refs #105112] added history entry for eea.jquery --- docs/HISTORY.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index b0bfc3f..74d8d6e 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -3,6 +3,9 @@ Changelog 11.2-dev0 - (unreleased) --------------------- +* Change: patch slick.grid.js to use dispatch.call instead of handle.call + since handle is gone from jquery 3 + [ichim-david refs #105112] 11.1 - (2019-03-25) --------------------- From 231324a8305af90a2cd33a52753e6312239d548a Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Fri, 28 Feb 2020 18:31:00 +0200 Subject: [PATCH 4/8] Updated version to 11.2 --- eea/jquery/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/jquery/version.txt b/eea/jquery/version.txt index 678fbef..26d6dad 100644 --- a/eea/jquery/version.txt +++ b/eea/jquery/version.txt @@ -1 +1 @@ -11.2-dev0 +11.2 From 4bd3913012fb5c0f93e0a4e6d4a7882abbde4f44 Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Fri, 28 Feb 2020 18:36:04 +0200 Subject: [PATCH 5/8] Updated setup.py, added long_description_content_type - needs review --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index b2e7a6b..7d816f6 100644 --- a/setup.py +++ b/setup.py @@ -11,6 +11,7 @@ setup(name=NAME, version=VERSION, description="jQuery library and plugins for Plone", + long_description_content_type="text/x-rst", long_description=open("README.rst").read() + "\n" + open(os.path.join("docs", "HISTORY.txt")).read(), # https://pypi.python.org/pypi?%3Aaction=list_classifiers From 6bed833a92ab7ba4f4a75dd3f85f7fbd90a05dda Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Fri, 28 Feb 2020 18:36:06 +0200 Subject: [PATCH 6/8] Fixed short title underlines in changelog --- docs/HISTORY.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index 74d8d6e..b3d2463 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -2,13 +2,13 @@ Changelog ========= 11.2-dev0 - (unreleased) ---------------------- +-------------------------- * Change: patch slick.grid.js to use dispatch.call instead of handle.call since handle is gone from jquery 3 [ichim-david refs #105112] 11.1 - (2019-03-25) ---------------------- +-------------------------- * Bug fix: fixed jquery.galleryview behavior when more than 1 gallery is added and javascript is loaded on the bottom [ichim-david refs #104101] @@ -17,22 +17,22 @@ Changelog [ichim-david refs #104101] 11.0 - (2019-01-28) ---------------------- +-------------------------- * Jenkins: Add sonarqube step [avoinea refs #101552] 10.9 - (2018-10-05) ---------------------- +-------------------------- * Feature: Added support for Matomo analytics reading events [avoinea refs #98857] 10.8 - (2018-07-27) ---------------------- +-------------------------- * Bug fix: jQuery.timer is undefined [avoinea refs #97410] 10.7 - (2018-06-20) ---------------------- +-------------------------- * Change: updated URLs pointing to eea.europa.eu with https:// [alecghica refs #95849] From 243340b31ccccb53857f9b6de21715efe60cc54a Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Fri, 28 Feb 2020 18:43:39 +0200 Subject: [PATCH 7/8] Updated MANIFEST.in, recreated it from template using eea - needs review --- MANIFEST.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index bc9b88e..8a7e39e 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,7 @@ +include *.md *.rst *.txt +graft docs +graft eea global-exclude *pyc global-exclude *~ global-exclude *.un~ global-include *.mo -global-include *mo From e66844c29927bc1788d244dec338b154f426d7a4 Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Fri, 28 Feb 2020 18:43:40 +0200 Subject: [PATCH 8/8] Updated changelog - removed develop information --- docs/HISTORY.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index b3d2463..bd92ccb 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,7 +1,7 @@ Changelog ========= -11.2-dev0 - (unreleased) +11.2 - (2020-02-28) -------------------------- * Change: patch slick.grid.js to use dispatch.call instead of handle.call since handle is gone from jquery 3