-
-
Notifications
You must be signed in to change notification settings - Fork 15
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
Add WireGuard VPN Interfaces #61
Conversation
Removed/modified code related to "var $j = jQuery.noConflict();" which is now considered obsolete.
I just updated my forked repo of spdMerlin, took a quick look at your PR for the latest changes, and noticed some errors in the JavaScript file that's currently in the repository. See screenshot below: As you can see, the same pair of variables is defined 6 times, which is most likely not your intention. Can you double-check this code and verify that the JavaScript that got embedded into the ASP file is the correct version and the file in the repository gets fixed? Thanks. |
Do i need to unpick the changes? |
Well, it looks like the minified version of the JS file that got embedded into the ASP has that part of the code corrected, but I haven't reviewed the rest. My impression is that what we have is 2 versions of the JS file: the one in the repository and the one that got minified and embedded, and they don't match; but the minified version seems to be working. Anyway, you could roll back the changes now, or wait for @ExtremeFiretop to respond. My 2 cents. |
You are absolutely correct in your assessment. The minified version of the JS file that got embedded into the ASP has that part of the code corrected. Everything is actually functional, however I totally forgot to go back and update the actual .js file with the changes to the values I used!!! Will quickly whip up a correction to the master .js file in a moment. |
Bingo! #62 Donezo; sorry about that mixup! The original master .js file was supposed to be updated once I got the minified version working ;) |
I do pride myself on making myself available, but you happened to find my mixup while I was catching a few hours of zzzz's! |
Add WireGuard VPN Interfaces.
This is an additional change to @Martinski4GitHub 's PR: 60
Just figured today seems WireGuard is the more prominent VPN solution, and it's an easy addition.
Wanted to add a quick unrelated note that the develop branch of spdMerlin has been working well for some time :)
My 2 cents is it's ready to merge to master branch.