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

Cleanup admin settings js files #31116

Merged
merged 2 commits into from
Feb 18, 2022
Merged

Cleanup admin settings js files #31116

merged 2 commits into from
Feb 18, 2022

Conversation

CarlSchwan
Copy link
Member

  • Move admin.js to webpack, so that this uses the bundled jquery files
    instead of the deprecated window.$ Also fixing formatting

  • Remove log.js that seems to be from a time when logreader was bundled
    with server and I couldn't find an usage of it anymore

@CarlSchwan CarlSchwan force-pushed the fix/admin-jquery-loading branch from 202ad84 to da8fa76 Compare February 10, 2022 23:15
@CarlSchwan CarlSchwan requested review from a team, PVince81, artonge and skjnldsv and removed request for a team February 14, 2022 17:17
Copy link
Contributor

@artonge artonge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, how many warnings does this remove? 😄

@CarlSchwan
Copy link
Member Author

Nice, how many warnings does this remove? 😄

Not enough, still so many to go 😜

@MichaIng MichaIng added this to the Nextcloud 24 milestone Feb 15, 2022
@MichaIng MichaIng added 3. to review Waiting for reviews javascript labels Feb 15, 2022
@artonge
Copy link
Contributor

artonge commented Feb 15, 2022

Arf, need rebase

@CarlSchwan CarlSchwan force-pushed the fix/admin-jquery-loading branch from da8fa76 to 0c138d8 Compare February 16, 2022 13:08
@CarlSchwan
Copy link
Member Author

When rebasing I noticed, I had a bit more changes locally to fix one issue with the enabling and disabling apps. Now errors are properly handled and most importantly when enabling an app there is no error anymore. I moved the entire rebuild-navigation method to webpack and ported it to vanillajs. I also ported to @nextcloud/dialog

apps/settings/js/apps.js Show resolved Hide resolved
apps/settings/css/settings.scss Show resolved Hide resolved
@CarlSchwan CarlSchwan force-pushed the fix/admin-jquery-loading branch from 0c138d8 to a6b5dae Compare February 17, 2022 13:05
* Move admin.js to webpack, so that this use the bundled jquery files
  instead of the deprecated window.$ Also fixing formatting

* Remove log.js that seems to be from a time where logreader was bundled
  with server and I couldn't find an usage of it anymore

* Fix recent regression in rebuild navigation function (now not depending on
  jquery anymore and bundled by webpack).

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
@CarlSchwan CarlSchwan force-pushed the fix/admin-jquery-loading branch from b576cef to e1f8b09 Compare February 17, 2022 17:03
@PVince81 PVince81 merged commit d251847 into master Feb 18, 2022
@PVince81 PVince81 deleted the fix/admin-jquery-loading branch February 18, 2022 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews javascript
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants