Skip to content

Commit 130aa6c

Browse files
committed
Transpile ES6 to ES5 for filemanager. Closes pterodactyl#224
1 parent aa6e733 commit 130aa6c

File tree

9 files changed

+39
-7
lines changed

9 files changed

+39
-7
lines changed

.babelrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"presets": ["es2015"],
3+
"compact": true,
4+
"minified": true,
5+
"only": "public/js/files/*.js",
6+
"sourceMaps": "inline",
7+
"comments": false
8+
}

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ Homestead.yaml
99
Vagrantfile
1010
Vagrantfile
1111

12-
node_modules
13-
.babelrc
12+
node_modules

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
1515
* Fixes bug that would allow adding the owner of a server as a subuser for that same server.
1616
* Fixes bug that would allow creating multiple subusers with the same email address.
1717
* Fixes bug where Sponge servers were improperly tagged as a spigot server in the daemon causing issues when booting or modifying configuration files.
18+
* Use transpiled ES6 -> ES5 filemanager code in browsers.
19+
20+
### Changed
21+
* Filemanager and EULA checking javascript is now written in pure ES6 code rather than as a blade-syntax template. This allows the use of babel to transpile into ES5 as a minified version.
1822

1923
## v0.5.5 (Bodacious Boreopterus)
2024
### Added

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"dingo/api": "1.0.0-beta6",
2828
"aws/aws-sdk-php": "3.19.20",
2929
"predis/predis": "1.1.1",
30-
"laracasts/utilities": "^2.1"
30+
"laracasts/utilities": "2.1.0"
3131
},
3232
"require-dev": {
3333
"fzaninotto/faker": "~1.4",

package.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"name": "pterodactyl-panel",
3+
"devDependencies": {
4+
"babel-cli": "6.18.0",
5+
"babel-plugin-transform-strict-mode": "^6.18.0",
6+
"babel-preset-es2015": "6.18.0"
7+
},
8+
"scripts": {
9+
"build": "./node_modules/babel-cli/bin/babel.js public/js/files --source-maps --out-file public/js/filemanager.min.js"
10+
}
11+
}

public/js/filemanager.min.js

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/filemanager.min.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/files/contextmenu.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class ContextMenuClass {
6262

6363
if (Pterodactyl.permissions.createFiles) {
6464
buildMenu += '<li class="divider"></li> \
65-
<li data-action="file"><a href="/server/{{ $server->uuidShort }}/files/add/?dir=' + newFilePath + '" class="text-muted"><i class="fa fa-fw fa-plus"></i> New File</a></li> \
65+
<li data-action="file"><a href="/server/'+ Pterodactyl.server.uuidShort +'/files/add/?dir=' + newFilePath + '" class="text-muted"><i class="fa fa-fw fa-plus"></i> New File</a></li> \
6666
<li data-action="folder"><a tabindex="-1" href="#"><i class="fa fa-fw fa-folder"></i> New Folder</a></li>';
6767
}
6868

resources/views/server/files/index.blade.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,13 @@
5858
</div>
5959
</div>
6060
</div>
61-
{!! Theme::js('js/files/index.js') !!}
62-
{!! Theme::js('js/files/contextmenu.js') !!}
63-
{!! Theme::js('js/files/actions.js') !!}
61+
@if(App::environment('production'))
62+
{!! Theme::js('js/filemanager.min.js') !!}
63+
@else
64+
{!! Theme::js('js/files/index.js') !!}
65+
{!! Theme::js('js/files/contextmenu.js') !!}
66+
{!! Theme::js('js/files/actions.js') !!}
67+
@endif
6468
<script>
6569
$(window).load(function () {
6670
$('.server-files').addClass('active');

0 commit comments

Comments
 (0)