Skip to content

Commit

Permalink
Merge branch 'develop' into dropdownSizeFormSpec
Browse files Browse the repository at this point in the history
  • Loading branch information
lubber-de authored Dec 1, 2023
2 parents 9f1449f + 1220ca3 commit d473422
Show file tree
Hide file tree
Showing 7 changed files with 261 additions and 213 deletions.
12 changes: 11 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -658,10 +658,20 @@
"contributions": [
"security"
]
},
{
"login": "alvarolm",
"name": "Alvaro",
"avatar_url": "https://avatars.githubusercontent.com/u/2561547?v=4",
"profile": "https://twitter.com/alvarofleiva",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 4,
"repoType": "github",
"repoHost": "https://github.com",
"skipCi": true
"skipCi": true,
"commitType": "docs"
}
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
- name: Install dependencies
run: yarn && yarn add -D eslint-config-airbnb-base@^15 eslint-plugin-unicorn@^46 eslint-plugin-jest@^26.9.0 @typescript-eslint/eslint-plugin @typescript-eslint/parser typescript
- name: Lint JS and LESS files
Expand All @@ -30,7 +30,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: pre-install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v4
with:
ref: develop
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18
registry-url: https://registry.npmjs.org/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4
with:
ref: master
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18
registry-url: https://registry.npmjs.org/
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ This is a list of all project contributors powered by [All Contributors](https:/
<tr>
<td align="center" valign="top" width="25%"><a href="http://www.mathieumitchell.com"><img src="https://avatars.githubusercontent.com/u/234168?v=4?s=60" width="60px;" alt="Mathieu Mitchell"/><br /><sub><b>Mathieu Mitchell</b></sub></a><br /><a href="https://github.com/fomantic/Fomantic-UI/commits?author=mat128" title="Code">💻</a></td>
<td align="center" valign="top" width="25%"><a href="https://github.com/brian-codes"><img src="https://avatars.githubusercontent.com/u/37519149?v=4?s=60" width="60px;" alt="Brian McCluskey"/><br /><sub><b>Brian McCluskey</b></sub></a><br /><a href="#security-brian-codes" title="Security">🛡️</a></td>
<td align="center" valign="top" width="25%"><a href="https://twitter.com/alvarofleiva"><img src="https://avatars.githubusercontent.com/u/2561547?v=4?s=60" width="60px;" alt="Alvaro"/><br /><sub><b>Alvaro</b></sub></a><br /><a href="https://github.com/fomantic/Fomantic-UI/commits?author=alvarolm" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
2 changes: 1 addition & 1 deletion src/definitions/behaviors/form.js
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@
$field = module.get.field(field.identifier),
value = $field.val(),
prompt = isFunction(rule.prompt)
? rule.prompt(value)
? rule.prompt.call($field[0], value)
: rule.prompt || settings.prompt[ruleName] || settings.text.unspecifiedRule,
requiresValue = prompt.search('{value}') !== -1,
requiresName = prompt.search('{name}') !== -1,
Expand Down
Loading

0 comments on commit d473422

Please sign in to comment.