Skip to content

Commit

Permalink
Merge pull request #1097 from duhrer/FLUID-6755
Browse files Browse the repository at this point in the history
FLUID-6755: Update to last released version of fluid-lint-all.
  • Loading branch information
amb26 authored Nov 22, 2022
2 parents 43b6b36 + e8e0fc0 commit 735bc6d
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 9 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ below.

##### -i, --include

__value__: "module(s)" (String)
**value**: "module(s)" (String)
_only available to custom builds_

The `--include` option takes a comma-separated string of the [Modules](#modules) to be included in a custom package.
Expand All @@ -155,7 +155,7 @@ npm run build:pkg:custom -- -i "fluid-inline-edit, fluid-ui-options"

##### -e, --exclude

__value__: "module(s)" (String)
**value**: "module(s)" (String)
_only available to custom builds_

The `--exclude` option takes a comma-separated string of the [Modules](#modules) to be excluded from a custom package.
Expand All @@ -170,7 +170,7 @@ npm run build:pkg:custom -- -e jquery

##### -n, --name

__value__: "custom suffix" (String)
**value**: "custom suffix" (String)
_only available to custom packages which have specified an include and/or exclude option_

By default, custom packages are given a name in the form _infusion-custom-{version}.zip_ and the concatenated JavaScript
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@
"browserslist-config-fluid": "0.1.0",
"cpy-cli": "3.1.1",
"dayjs": "1.10.7",
"eslint-config-fluid": "2.0.0",
"eslint-plugin-jsdoc": "37.0.3",
"eslint-config-fluid": "2.1.1",
"eslint-plugin-jsdoc": "39.6.2",
"fast-glob": "3.2.11",
"fluid-lint-all": "1.1.5",
"fluid-lint-all": "1.2.3",
"fluid-testem": "2.1.15",
"hypher": "0.2.5",
"jquery": "3.6.0",
Expand Down
2 changes: 2 additions & 0 deletions src/framework/core/js/Fluid.js
Original file line number Diff line number Diff line change
Expand Up @@ -1273,13 +1273,15 @@ fluid.bind = function (obj, fnName, args) {

// Stub for function in FluidIoC.js
fluid.proxyComponentArgs = fluid.identity;
/* eslint-disable jsdoc/require-returns-check */
/**
* Allows for the calling of a function from an EL expression "functionPath", with the arguments "args", scoped to an framework version "environment".
* @param {Object} functionPath - An EL expression
* @param {Object} args - An array of arguments to be applied to the function, specified in functionPath
* @param {Object} [environment] - (optional) The object to scope the functionPath to (typically the framework root for version control)
* @return {Any} - The return value from the invoked function.
*/
/* eslint-enable jsdoc/require-returns-check */
fluid.invokeGlobalFunction = function (functionPath, args, environment) {
var func = fluid.getGlobalValue(functionPath, environment);
if (!func) {
Expand Down
2 changes: 2 additions & 0 deletions src/framework/core/js/FluidIoC.js
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,7 @@ fluid.matchIoCSelector = function (selector, thatStack, contextHashes, memberNam
return false;
}
}
return false;
};

// supported, PUBLIC API function
Expand Down Expand Up @@ -2251,6 +2252,7 @@ fluid.applyWorkflowPhase = function (transRec, sequencer) {
}
}
}
return false;
};

/** Operate one phase of a tree transaction, consisting of a list of component destructions and a list of
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/js/FluidView.js
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ fluid.materialiserRegistry["fluid.viewComponent"] = {
* radio button/checkbox sets, potentially, given a node corresponding to just one element.
* @param {jQuery} nodeIn - The node whose value is to be read or written
* @param {Any} newValue - If `undefined`, the value will be read, otherwise, the supplied value will be applied to the node
* @return {Any} The queried value, if `newValue` was undefined
* @return {Any|undefined} The queried value, if `newValue` was undefined, otherwise `undefined`.
*/
fluid.value = function (nodeIn, newValue) {
var node = fluid.unwrap(nodeIn);
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/js/MessageResolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ fluid.messageLocator = function (messageBase, resolveFunc) {
* function.
*
* @param {Object} messageSource - See above.
* @return {Function|String} - A resolve function or a `String` representing the final resolved output.
* @return {Function|String|undefined} - A resolve function or a `String` representing the final resolved output.
*/
fluid.resolveMessageSource = function (messageSource) {
if (messageSource.type === "data") {
Expand Down
1 change: 1 addition & 0 deletions src/framework/preferences/js/PrimaryBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ fluid.prefs.primaryBuilder.defaultSchemaIndexer = function (defaults) {
if (defaults.schema) {
return fluid.keys(defaults.schema.properties);
}
return [];
};

/*******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/framework/preferences/js/Store.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ fluid.defaults("fluid.prefs.cookieStore.writable", {
* Retrieve and return the value of the cookie
*
* @param {CookieOpts} options - the cookie attributes; used to get the cookie name.
* @return {String} - the serialized cookie
* @return {String|undefined} - the serialized cookie, or `undefined` if no cookie is found.
*/
fluid.prefs.cookieStore.getCookie = function (options) {
var cookieName = fluid.get(options, ["directModel", "cookieName"]) || options.name;
Expand Down

0 comments on commit 735bc6d

Please sign in to comment.