Major cleanup of Ace editor files, as well as hopefully fixing broken editor issues.

Author: DaneEveritt

CHANGELOG.md

@@ -7,7 +7,8 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 ### Fixed
 * `[beta.1]` — Fixes task management ststem not running correctly.
 * `[beta.1]` — Fixes API endpoint for command sending missing the required class definition.
-* `[beta.1]` — Fixes panel looking fo an old compiled classfile that is no longer used. This was causing errors relating to `missing class DingoAPI` when trying to upgrade the panel.
+* `[beta.1]` — Fixes panel looking for an old compiled classfile that is no longer used. This was causing errors relating to `missing class DingoAPI` when trying to upgrade the panel.
+* `[beta.1]` — Should fix render issues when trying to edit some files via the panel file editor.
 
 ## v0.6.0-beta.1 (Courageous Carniadactylus)
 ### Fixed

public/themes/pterodactyl/js/frontend/console.js

@@ -52,12 +52,6 @@ var InitialLogSent = false;
             TerminalNotifyElement.addClass('hidden');
         }
     })
-    // Socket.on('initial status', function (data) {
-    //     Terminal.clear();
-    //     if (data.status === 1 || data.status === 2) {
-    //         Socket.emit('send server log');
-    //     }
-    // });
 })();
 
 (function pushOutputQueue() {
@@ -86,7 +80,6 @@ var InitialLogSent = false;
 (function setupSocketListeners() {
     // Update Listings on Initial Status
     Socket.on('initial status', function (data) {
-        console.log('initial status 2');
         if (! InitialLogSent) {
             updateServerPowerControls(data.status);
 

public/themes/pterodactyl/js/frontend/files/editor.js

@@ -17,16 +17,19 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
-$(document).ready(function () {
-    const Editor = ace.edit('editor');
-    const Modelist = ace.require('ace/ext/modelist')
+(function () {
+    window.Editor = ace.edit('editor');
+    var Whitespace = ace.require('ace/ext/whitespace');
+    var Modelist = ace.require('ace/ext/modelist');
 
     Editor.setTheme('ace/theme/chrome');
     Editor.getSession().setUseWrapMode(true);
     Editor.setShowPrintMargin(false);
 
-    if (typeof Pterodactyl !== 'undefined' && typeof Pterodactyl.stat !== 'undefined') {
-        Editor.getSession().setMode(Modelist.getModeForPath(Pterodactyl.stat.name).mode);
+    if (typeof Pterodactyl !== 'undefined') {
+        if(typeof Pterodactyl.stat !== 'undefined') {
+            Editor.getSession().setMode(Modelist.getModeForPath(Pterodactyl.stat.name).mode);
+        }
     }
 
     Editor.commands.addCommand({
@@ -42,6 +45,10 @@ $(document).ready(function () {
         readOnly: false
     });
 
+    Editor.commands.addCommands(Whitespace.commands);
+
+    Whitespace.detectIndentation(Editor.session);
+
     $('#save_file').on('click', function (e) {
         e.preventDefault();
         save();
@@ -121,4 +128,4 @@ $(document).ready(function () {
             $('#save_file').html('<i class="fa fa-fw fa-save"></i> &nbsp;Save File').removeClass('disabled');
         });
     }
-});
+})();

public/themes/pterodactyl/js/frontend/server.socket.js

@@ -50,13 +50,11 @@ var Server = (function ()  {
 
         var notifySocketError = false;
 
-        console.log('Starting connection');
         window.Socket = io(Pterodactyl.node.scheme + '://' + Pterodactyl.node.fqdn + ':' + Pterodactyl.node.daemonListen + '/ws/' + Pterodactyl.server.uuid, {
             'query': 'token=' + Pterodactyl.server.daemonSecret,
         });
 
         Socket.io.on('connect_error', function (err) {
-            console.log('connect_error');
             if(typeof notifySocketError !== 'object') {
                 notifySocketError = $.notify({
                     message: 'There was an error attempting to establish a WebSocket connection to the Daemon. This panel will not work as expected.<br /><br />' + err,
@@ -69,15 +67,13 @@ var Server = (function ()  {
 
         // Connected to Socket Successfully
         Socket.on('connect', function () {
-            console.log('connect');
             if (notifySocketError !== false) {
                 notifySocketError.close();
                 notifySocketError = false;
             }
         });
 
         Socket.on('initial status', function (data) {
-            console.log('initial status');
             setStatusIcon(data.status);
         });