Adds php beautifing

Andr3as · Jul 10, 2014 · a57708d · a57708d
1 parent a7bb4d2
commit a57708d
Show file tree

Hide file tree

Showing 7 changed files with 360 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 #Beautify
 
-Beautify js, json, html or css files.
+Beautify js, json, html, css of php files.
 
 ##Installation
 

diff --git a/controller.php b/controller.php
@@ -5,7 +5,7 @@
  * See http://opensource.org/licenses/MIT for more information.
  * This information must remain intact.
  */
-    //error_reporting(0);
+    error_reporting(0);
 
     require_once('../../common.php');
     checkSession();

diff --git a/default.settings.json b/default.settings.json
@@ -3,7 +3,8 @@
 		"js": false,
 		"json": false,
 		"html": false,
-		"css": false
+		"css": false,
+		"php": false
 	},
 	"beautify": {
 		"indent_size": 1,

diff --git a/dialog.php b/dialog.php
@@ -11,6 +11,7 @@
     <input type="checkbox" id="beautify_json">Beautify JSON <br>
     <input type="checkbox" id="beautify_html">Beautify HTML <br>
     <input type="checkbox" id="beautify_css">Beautify CSS <br>
+    <input type="checkbox" id="beautify_php">Beautify PHP <br>
     <button onclick="codiad.Beautify.save(); return false;">Close</button>
     <script>
         codiad.Beautify.get();

diff --git a/init.js b/init.js
@@ -19,17 +19,21 @@
     codiad.Beautify = {
 
         path: curpath,
+        beautifyPhp: null,
         settings: {
             js: false, json: false, html: false, css: false, auto: false
         },
-        files: ["html", "htm", "js", "json", "css"],
+        files: ["html", "htm", "js", "json", "css", "php"],
 
         init: function() {
             var _this = this;
             //Load libs
             $.getScript(this.path+"libs/beautify-css.js");
             $.getScript(this.path+"libs/beautify-html.js");
             $.getScript(this.path+"libs/beautify.js");
+            $.getScript(this.path+"libs/ext-beautify.js", function() {
+				_this.beautifyPhp = ace.require("ace/ext/beautify");
+			});
             //Load settings
             this.load();
             //Set subscriptions
@@ -56,7 +60,7 @@
             });
             amplify.subscribe('context-menu.onShow', function(obj){
                 var ext = _this.getExtension(obj.path);
-                if (_this.files.indexOf(ext) != -1) {
+                if (_this.files.indexOf(ext) != -1 && ext !== "php") {
                     $('#context-menu').append('<hr class="file-only beautify">');
                     $('#context-menu').append('<a class="file-only beautify" onclick="codiad.Beautify.contextMenu($(\'#context-menu\').attr(\'data-path\'));"><span class="icon-brush"></span>Beautify</a>');
                 }
@@ -86,6 +90,7 @@
             this.checkSettings("json");
             this.checkSettings("html");
             this.checkSettings("css");
+            this.checkSettings("php");
             $.post(this.path+"controller.php?action=save", {settings: JSON.stringify(this.settings)}, function(data){
                 var json = JSON.parse(data);
                 if (json.status == "error") {
@@ -120,6 +125,7 @@
             this.setSettings("json");
             this.setSettings("html");
             this.setSettings("css");
+            this.setSettings("php");
         },
 
         //////////////////////////////////////////////////////////
@@ -201,8 +207,11 @@
                 return css_beautify(content, settings);
             } else if (ext == "js" || ext == "json") {
                 return js_beautify(content, settings);
+            } else if (ext == "php") {
+				this.beautifyPhp.beautify(codiad.editor.getActive().getSession());
+				return false;
             } else {
-                return content;
+                return false;
             }
         },
 
@@ -226,7 +235,9 @@
                     text = session.getTextRange(range);
                 }
                 text = _this.beautifyContent(path, text, settings);
-                session.replace(range, text);
+                if (text !== false) {
+					session.replace(range, text);
+                }
             };
             if (selText !== "") {
                 if (editor.selection.inMultiSelectMode) {