Skip to content

Fix how Bootstrap-Notfy is used by Pi-hole #2786

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

Merged
merged 1 commit into from
Oct 28, 2023

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Oct 27, 2023

What does this implement/fix?

See title, this follows the documentation at https://grotesquegentleadvance--samkhaled.repl.co/

Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested a review from a team October 27, 2023 14:35
function showAlert(type, icon, title, message) {
var opts = {};
title = "&nbsp;<strong>" + title + "</strong><br>";
const options = {
Copy link
Member Author

Choose a reason for hiding this comment

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

We use const here. I will details the why below in case anyone doesn't know (I will admit: I didn't know).

In JavaScript, const is used to declare a variable that cannot be reassigned. However, it does not make the variable immutable. This means that while you cannot reassign a const variable to a new value, you can still modify the properties of an object that is assigned to a const variable.

Here, the options and settings objects are declared using const. This means that you cannot reassign them to a new value. However, the properties of these objects can still be modified.

For example, the options and settings objects are modified based on the type parameter. The icon property of the options object is set to a default value if it is not provided, and the delay property of the settings object is multiplied by 2 if the type is "warning" or "error".

In summary, const in JavaScript does not make objects immutable, it only prevents the variable from being reassigned to a new value which seems a bit counter-intuitive given the name "const".

@@ -194,7 +194,6 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-select.min.js')?>"></script>
<script src="<?=pihole.fileversion('scripts/pi-hole/js/ip-address-sorting.js')?>"></script>
<script src="<?=pihole.fileversion('scripts/vendor/daterangepicker.min.js')?>"></script>
<script src="<?=pihole.fileversion('scripts/pi-hole/js/utils.js')?>"></script>
Copy link
Member Author

Choose a reason for hiding this comment

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

utils.js is already included on all pages from the header. No need to do it a second time here.

Copy link
Member

@PromoFaux PromoFaux left a comment

Choose a reason for hiding this comment

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

Tested OK

@DL6ER DL6ER merged commit a8a5d39 into development-v6 Oct 28, 2023
@DL6ER DL6ER deleted the fix/bootstrap_notify branch October 28, 2023 16:00
@yubiuser
Copy link
Member

yubiuser commented Nov 2, 2023

I'm not sure if this PR broke it, but I thought we had some kind of fade in/out animation for the notifications. But they don't fade anymore...


Edit
Was broken before. Fixed by #2802

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants