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.

Sign up for GitHub

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

Jump to bottom

Deduplicate js #1376

Merged
merged 4 commits into from
May 29, 2020
Merged

Deduplicate js #1376

merged 4 commits into from
May 29, 2020

Conversation

XhmikosR
Copy link
Contributor

@XhmikosR XhmikosR commented May 25, 2020 •
edited

By submitting this pull request, I confirm the following: {please fill any appropriate checkboxes, e.g: [X]}

{Please ensure that your pull request is for the 'devel' branch!}

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)
  • I have Signed Off all commits. (git commit --signoff)

Might conflict with #1332 but I can rebase either one @PromoFaux

@XhmikosR XhmikosR marked this pull request as ready for review May 25, 2020 09:58
@XhmikosR XhmikosR force-pushed the deduplicate-js branch 6 times, most recently from dccbeb8 to 5e772c2 Compare May 28, 2020 18:35
@XhmikosR XhmikosR mentioned this pull request May 28, 2020
Closed
9 tasks
@PromoFaux
Copy link
Member

Is this one good to go?

@XhmikosR
Move escapeHtml to utils.
eab6485 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
@XhmikosR
Copy link
Contributor Author

Yeah, rebased.

@XhmikosR XhmikosR added this to the v5.1 milestone May 29, 2020
@XhmikosR
Move objectToArray() to utils.
7f71f1d 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
@XhmikosR
Move padNumber() to utils.
61c29ca 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
@XhmikosR
index.js: assorted simplifications
7caabf7 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>

* rename `colors` variable to avoid shadowing and be more clear
* remove function used only once
* simplify a couple of for loops
@PromoFaux PromoFaux merged commit dd678da into devel May 29, 2020
@PromoFaux PromoFaux deleted the deduplicate-js branch May 29, 2020 22:10
@PromoFaux PromoFaux mentioned this pull request Jul 5, 2020
Merged
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-5-1-released/35577/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PromoFaux PromoFaux PromoFaux approved these changes

Assignees
No one assigned
Labels
Code maintenance
Projects
None yet
Milestone
v5.1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@XhmikosR @PromoFaux @pralor-bot