From b0da3b42d74b810005c3f0c949834be418b495fa Mon Sep 17 00:00:00 2001 From: MichaelDaum Date: Mon, 27 Nov 2023 17:15:35 +0100 Subject: [PATCH] Item13883: preparing release --- JQueryPlugin/.gitignore | 3 ++- .../plugins/foswiki/jquery.foswiki.uncompressed.js | 9 ++++++++- .../plugins/scrollto/jquery.scrollTo.uncompressed.js | 4 ++-- .../pub/System/JQueryPlugin/plugins/scrollto/pkg.js | 2 +- .../JQueryPlugin/plugins/scrollto/pkg.uncompressed.js | 4 ++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/JQueryPlugin/.gitignore b/JQueryPlugin/.gitignore index 13bb5c14d8..f4f1175544 100644 --- a/JQueryPlugin/.gitignore +++ b/JQueryPlugin/.gitignore @@ -146,4 +146,5 @@ pub/System/JQueryPlugin/plugins/fontawesome/git-fontawesome-animation/ /pub/System/JQueryPlugin/plugins/ui/jquery.ui.tooltip.init.js /pub/System/JQueryPlugin/plugins/view/jquery.observable.js /pub/System/JQueryPlugin/plugins/view/jquery.views.js -/pub/System/JQueryPlugin/cache +/pub/System/JQueryPlugin/cache/*js +/pub/System/JQueryPlugin/cache/*css diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.uncompressed.js b/JQueryPlugin/pub/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.uncompressed.js index defe015bfe..6c3b93593c 100644 --- a/JQueryPlugin/pub/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.uncompressed.js +++ b/JQueryPlugin/pub/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.uncompressed.js @@ -1,6 +1,6 @@ /** * jQuery-foswiki: javascript base for foswiki - * Version: 3.10 + * Version: 3.11 */ /*global XMLHttpRequest:false, StrikeOne:false */ @@ -194,6 +194,7 @@ function _getScriptUrl(absolute, script, web, topic, params) { var suffix = foswiki.getPreference("SCRIPTSUFFIX") || "", scriptUrlPaths = foswiki.getPreference("SCRIPTURLPATHS"), + scriptUrlSeparator = foswiki.getPreference("SCRIPTURLSEPARATOR"), url = "", arr = []; script = script || ''; @@ -214,10 +215,16 @@ } if (typeof(web) !== 'undefined') { + if (script === 'view' && scriptUrlSeparator) { + web = foswiki.spaceOutWikiWord(web, scriptUrlSeparator); + } url += "/"+web; } if (typeof(topic) !== 'undefined') { + if (script === 'view' && scriptUrlSeparator && !/^(WebHome)$/.test(topic)) { + topic = foswiki.spaceOutWikiWord(topic, scriptUrlSeparator); + } url += "/"+topic; } diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/scrollto/jquery.scrollTo.uncompressed.js b/JQueryPlugin/pub/System/JQueryPlugin/plugins/scrollto/jquery.scrollTo.uncompressed.js index d9e7c1aef9..1ff850822f 100644 --- a/JQueryPlugin/pub/System/JQueryPlugin/plugins/scrollto/jquery.scrollTo.uncompressed.js +++ b/JQueryPlugin/pub/System/JQueryPlugin/plugins/scrollto/jquery.scrollTo.uncompressed.js @@ -93,7 +93,7 @@ } } - var offset = typeof(settings.offset) === "function" && settings.offset(elem, targ) || settings.offset; + var offset = $.isFunction(settings.offset) && settings.offset(elem, targ) || settings.offset; $.each(settings.axis.split(''), function(i, axis) { var Pos = axis === 'x' ? 'Left' : 'Top', @@ -180,7 +180,7 @@ }; function both(val) { - return typeof(val) === "function" || $.isPlainObject(val) ? val : { top:val, left:val }; + return $.isFunction(val) || $.isPlainObject(val) ? val : { top:val, left:val }; } // Add special hooks so that window scroll properties can be animated diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/scrollto/pkg.js b/JQueryPlugin/pub/System/JQueryPlugin/plugins/scrollto/pkg.js index 1133f0bf7a..f649f757fb 100644 --- a/JQueryPlugin/pub/System/JQueryPlugin/plugins/scrollto/pkg.js +++ b/JQueryPlugin/pub/System/JQueryPlugin/plugins/scrollto/pkg.js @@ -7,4 +7,4 @@ * @author Ariel Flesler * @version 2.1.2 */ -!function(e){"use strict";"function"==typeof define&&define.amd?define(["jquery"],e):"undefined"!=typeof module&&module.exports?module.exports=e(require("jquery")):e(jQuery)}((function(e){"use strict";var t=e.scrollTo=function(t,o,n){return e(window).scrollTo(t,o,n)};function o(t){return!t.nodeName||-1!==e.inArray(t.nodeName.toLowerCase(),["iframe","#document","html","body"])}function n(t){return"function"==typeof t||e.isPlainObject(t)?t:{top:t,left:t}}return t.defaults={axis:"xy",duration:0,limit:!0},e.fn.scrollTo=function(r,i,s){"object"==typeof i&&(s=i,i=0),"function"==typeof s&&(s={onAfter:s}),"max"===r&&(r=9e9),s=e.extend({},t.defaults,s),i=i||s.duration;var a=s.queue&&s.axis.length>1;return a&&(i/=2),s.offset=n(s.offset),s.over=n(s.over),this.each((function(){if(null!==r){var f,u=o(this),c=u?this.contentWindow||window:this,l=e(c),d=r,m={};switch(typeof d){case"number":case"string":if(/^([+-]=?)?\d+(\.\d+)?(px|%)?$/.test(d)){d=n(d);break}d=u?e(d):e(d,c);case"object":if(0===d.length)return;(d.is||d.style)&&(f=(d=e(d)).offset())}var p="function"==typeof s.offset&&s.offset(c,d)||s.offset;e.each(s.axis.split(""),(function(e,o){var n="x"===o?"Left":"Top",r=n.toLowerCase(),i="scroll"+n,x=l[i](),v=t.max(c,o);if(f)m[i]=f[r]+(u?0:x-l.offset()[r]),s.margin&&(m[i]-=parseInt(d.css("margin"+n),10)||0,m[i]-=parseInt(d.css("border"+n+"Width"),10)||0),m[i]+=p[r]||0,s.over[r]&&(m[i]+=d["x"===o?"width":"height"]()*s.over[r]);else{var y=d[r];m[i]=y.slice&&"%"===y.slice(-1)?parseFloat(y)/100*v:y}s.limit&&/^\d+$/.test(m[i])&&(m[i]=m[i]<=0?0:Math.min(m[i],v)),!e&&s.axis.length>1&&(x===m[i]?m={}:a&&(h(s.onAfterFirst),m={}))})),h(s.onAfter)}function h(t){var o=e.extend({},s,{queue:!0,duration:i,complete:t&&function(){t.call(c,d,s)}});l.animate(m,o)}}))},t.max=function(t,n){var r="x"===n?"Width":"Height",i="scroll"+r;if(!o(t))return t[i]-e(t)[r.toLowerCase()]();var s="client"+r,a=t.ownerDocument||t.document,f=a.documentElement,u=a.body;return Math.max(f[i],u[i])-Math.min(f[s],u[s])},e.Tween.propHooks.scrollLeft=e.Tween.propHooks.scrollTop={get:function(t){return e(t.elem)[t.prop]()},set:function(t){var o=this.get(t);if(t.options.interrupt&&t._last&&t._last!==o)return e(t.elem).stop();var n=Math.round(t.now);o!==n&&(e(t.elem)[t.prop](n),t._last=this.get(t))}},t})),jQuery((function(e){e(document).on("click",".jqScrollToLink",(function(){var t=e(this),o=e.extend({},t.data(),t.metadata());return e.scrollTo(o.target,o),!1}))})); +!function(e){"use strict";"function"==typeof define&&define.amd?define(["jquery"],e):"undefined"!=typeof module&&module.exports?module.exports=e(require("jquery")):e(jQuery)}((function(e){"use strict";var t=e.scrollTo=function(t,n,o){return e(window).scrollTo(t,n,o)};function n(t){return!t.nodeName||-1!==e.inArray(t.nodeName.toLowerCase(),["iframe","#document","html","body"])}function o(t){return e.isFunction(t)||e.isPlainObject(t)?t:{top:t,left:t}}return t.defaults={axis:"xy",duration:0,limit:!0},e.fn.scrollTo=function(r,i,s){"object"==typeof i&&(s=i,i=0),"function"==typeof s&&(s={onAfter:s}),"max"===r&&(r=9e9),s=e.extend({},t.defaults,s),i=i||s.duration;var a=s.queue&&s.axis.length>1;return a&&(i/=2),s.offset=o(s.offset),s.over=o(s.over),this.each((function(){if(null!==r){var u,f=n(this),c=f?this.contentWindow||window:this,l=e(c),d=r,m={};switch(typeof d){case"number":case"string":if(/^([+-]=?)?\d+(\.\d+)?(px|%)?$/.test(d)){d=o(d);break}d=f?e(d):e(d,c);case"object":if(0===d.length)return;(d.is||d.style)&&(u=(d=e(d)).offset())}var p=e.isFunction(s.offset)&&s.offset(c,d)||s.offset;e.each(s.axis.split(""),(function(e,n){var o="x"===n?"Left":"Top",r=o.toLowerCase(),i="scroll"+o,x=l[i](),v=t.max(c,n);if(u)m[i]=u[r]+(f?0:x-l.offset()[r]),s.margin&&(m[i]-=parseInt(d.css("margin"+o),10)||0,m[i]-=parseInt(d.css("border"+o+"Width"),10)||0),m[i]+=p[r]||0,s.over[r]&&(m[i]+=d["x"===n?"width":"height"]()*s.over[r]);else{var w=d[r];m[i]=w.slice&&"%"===w.slice(-1)?parseFloat(w)/100*v:w}s.limit&&/^\d+$/.test(m[i])&&(m[i]=m[i]<=0?0:Math.min(m[i],v)),!e&&s.axis.length>1&&(x===m[i]?m={}:a&&(h(s.onAfterFirst),m={}))})),h(s.onAfter)}function h(t){var n=e.extend({},s,{queue:!0,duration:i,complete:t&&function(){t.call(c,d,s)}});l.animate(m,n)}}))},t.max=function(t,o){var r="x"===o?"Width":"Height",i="scroll"+r;if(!n(t))return t[i]-e(t)[r.toLowerCase()]();var s="client"+r,a=t.ownerDocument||t.document,u=a.documentElement,f=a.body;return Math.max(u[i],f[i])-Math.min(u[s],f[s])},e.Tween.propHooks.scrollLeft=e.Tween.propHooks.scrollTop={get:function(t){return e(t.elem)[t.prop]()},set:function(t){var n=this.get(t);if(t.options.interrupt&&t._last&&t._last!==n)return e(t.elem).stop();var o=Math.round(t.now);n!==o&&(e(t.elem)[t.prop](o),t._last=this.get(t))}},t})),jQuery((function(e){e(document).on("click",".jqScrollToLink",(function(){var t=e(this),n=e.extend({},t.data(),t.metadata());return e.scrollTo(n.target,n),!1}))})); diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/scrollto/pkg.uncompressed.js b/JQueryPlugin/pub/System/JQueryPlugin/plugins/scrollto/pkg.uncompressed.js index e9a4e44ef8..e559620366 100644 --- a/JQueryPlugin/pub/System/JQueryPlugin/plugins/scrollto/pkg.uncompressed.js +++ b/JQueryPlugin/pub/System/JQueryPlugin/plugins/scrollto/pkg.uncompressed.js @@ -93,7 +93,7 @@ } } - var offset = typeof(settings.offset) === "function" && settings.offset(elem, targ) || settings.offset; + var offset = $.isFunction(settings.offset) && settings.offset(elem, targ) || settings.offset; $.each(settings.axis.split(''), function(i, axis) { var Pos = axis === 'x' ? 'Left' : 'Top', @@ -180,7 +180,7 @@ }; function both(val) { - return typeof(val) === "function" || $.isPlainObject(val) ? val : { top:val, left:val }; + return $.isFunction(val) || $.isPlainObject(val) ? val : { top:val, left:val }; } // Add special hooks so that window scroll properties can be animated