Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update JS deps #1898

Merged
merged 2 commits into from
Oct 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/test-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ jobs:
run: |
mv public public.orig
mkdir public public/css public/external
cp public.orig/.gitattributes public
cp public.orig/.gitignore public
cp public.orig/logo.png public
cp public.orig/css/agileui.less public/css
Expand Down
4,220 changes: 1,984 additions & 2,236 deletions js/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/src/plugins/scroll.plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default class scroll extends atkPlugin {
/**
* Check if scrolling require adding content.
*
* @param e // event
* @param e event
*/
observe(e) {
const borderTopWidth = parseInt(this.$el.css('borderTopWidth'), 10);
Expand Down
4 changes: 2 additions & 2 deletions js/src/services/api.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class ApiService {
* By passig the jQuery reference, $ var use by code that need to be eval
* will work just fine, even if $ is not assign globally.
*
* @param code // javascript to be eval.
* @param $ // reference to jQuery.
* @param code javascript to be eval.
* @param $ reference to jQuery.
*/
evalResponse(code, $) { // eslint-disable-line no-shadow
eval(code); // eslint-disable-line no-eval
Expand Down
3 changes: 3 additions & 0 deletions public/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# workaround for vue
# https://github.com/vuejs/vue/issues/12819
/js/* -text -filter
1 change: 1 addition & 0 deletions public/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
!/.gitattributes
!/.gitignore
!/logo.png
!/*/
Expand Down
4 changes: 3 additions & 1 deletion public/js/atk-vue-inline-edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ const template = `
clearError: function () {
this.hasError = false;
},
flashError: function (count = 4) {
flashError: function () {
let count = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 4;

if (count === 0) {
this.hasError = false;
return;
Expand Down
2 changes: 1 addition & 1 deletion public/js/atk-vue-inline-edit.min.js

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

2 changes: 1 addition & 1 deletion public/js/atk-vue-inline-edit.min.js.map

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

2 changes: 1 addition & 1 deletion public/js/atk-vue-item-search.min.js

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

Loading