Skip to content

Commit 71245cb

Browse files
committed
Minor changes to support better dynamic JS loading
1 parent 332da79 commit 71245cb

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

app/Http/Controllers/Server/ServerController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ public function __construct()
5151
//
5252
}
5353

54-
public function getJavascript(Request $request, $uuid, $file)
54+
public function getJavascript(Request $request, $uuid, $folder, $file)
5555
{
5656
$server = Models\Server::getByUUID($uuid);
57-
return response()->view('server.js.' . $server->a_serviceFile . '.' . basename($file, '.js'), [
57+
return response()->view('server.js.' . $folder . '.' . basename($file, '.js'), [
5858
'server' => $server,
5959
'node' => Models\Node::find($server->node)
6060
])->header('Content-Type', 'application/javascript');

app/Http/Routes/ServerRoutes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public function map(Router $router) {
167167
// Assorted AJAX Routes
168168
$router->group(['prefix' => 'js'], function ($server) use ($router) {
169169
// Returns Server Status
170-
$router->get('{file}', [
170+
$router->get('{folder}/{file}', [
171171
'as' => 'server.js',
172172
'uses' => 'Server\ServerController@getJavascript'
173173
])->where('file', '.*');

resources/views/server/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
</div>
155155
</div>
156156
@if($server->a_serviceFile === 'minecraft')
157-
<script src="{{ route('server.js', [$server->uuidShort, 'minecraft/eula.js']) }}"></script>
157+
<script src="{{ route('server.js', [$server->uuidShort, 'minecraft', 'eula.js']) }}"></script>
158158
@endif
159159
<script>
160160
$(window).load(function () {

0 commit comments

Comments
 (0)