Skip to content

Commit 1cd9e8c

Browse files
committed
switch to jQuery 3.1.1 on new theme
will resolve pterodactyl#113
1 parent c62312b commit 1cd9e8c

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

public/js/plugins/minecraft/eula.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1818
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
1919
// SOFTWARE.
20-
$(window).load(function () {
20+
$(document).ready(function () {
2121
Socket.on('console', function (data) {
22-
if (data.line.indexOf('You need to agree to the EULA in order to run the server') > -1) {
22+
if (~data.line.indexOf('You need to agree to the EULA in order to run the server')) {
2323
swal({
2424
title: 'EULA Acceptance',
2525
text: 'By pressing \'I Accept\' below you are indicating your agreement to the <a href="https://account.mojang.com/documents/minecraft_eula" target="_blank">Mojang EULA</a>.',

resources/themes/pterodactyl/layouts/auth.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
Copyright &copy; 2015 - {{ date('Y') }} <a href="https://pterodactyl.io/" target="_blank">Pterodactyl Software &amp; Design</a>.<br />
4848
</p>
4949
</div>
50-
{!! Theme::js('js/vendor/jquery/jquery.min.js') !!}
50+
{!! Theme::js('vendor/jquery/jquery.min.js') !!}
5151
{!! Theme::js('vendor/bootstrap/bootstrap.min.js') !!}
5252
</body>
5353
</html>

resources/themes/pterodactyl/layouts/error.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</div>
6666
@section('footer-scripts')
6767
{!! Theme::js('js/laroute.js') !!}
68-
{!! Theme::js('js/vendor/jquery/jquery.min.js') !!}
68+
{!! Theme::js('vendor/jquery/jquery.min.js') !!}
6969
{!! Theme::js('vendor/bootstrap/bootstrap.min.js') !!}
7070
{!! Theme::js('vendor/slimscroll/jquery.slimscroll.min.js') !!}
7171
{!! Theme::js('vendor/adminlte/app.min.js') !!}

resources/themes/pterodactyl/layouts/master.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ class="active"
274274
</div>
275275
@section('footer-scripts')
276276
{!! Theme::js('js/laroute.js') !!}
277-
{!! Theme::js('js/vendor/jquery/jquery.min.js') !!}
277+
{!! Theme::js('vendor/jquery/jquery.min.js') !!}
278278
{!! Theme::js('vendor/sweetalert/sweetalert.min.js') !!}
279279
{!! Theme::js('vendor/bootstrap/bootstrap.min.js') !!}
280280
{!! Theme::js('vendor/slimscroll/jquery.slimscroll.min.js') !!}

0 commit comments

Comments
 (0)