Skip to content

Commit

Permalink
Item13883: preparing release
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelDaum committed Nov 27, 2023
1 parent fad4019 commit b0da3b4
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 7 deletions.
3 changes: 2 additions & 1 deletion JQueryPlugin/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* jQuery-foswiki: javascript base for foswiki
* Version: 3.10
* Version: 3.11
*/

/*global XMLHttpRequest:false, StrikeOne:false */
Expand Down Expand Up @@ -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 || '';
Expand All @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b0da3b4

Please sign in to comment.