From 4ca30f988897a5cd5d40eb10d55983a2016d50f6 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Tue, 5 Jul 2016 19:58:51 +1000
Subject: [PATCH] Beautify saved content

---
 .../formwidgets/richeditor/assets/js/build-min.js        | 7 ++++---
 .../formwidgets/richeditor/assets/js/richeditor.js       | 9 +++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/modules/backend/formwidgets/richeditor/assets/js/build-min.js b/modules/backend/formwidgets/richeditor/assets/js/build-min.js
index b1eabb902..5c543aab3 100755
--- a/modules/backend/formwidgets/richeditor/assets/js/build-min.js
+++ b/modules/backend/formwidgets/richeditor/assets/js/build-min.js
@@ -540,8 +540,8 @@ this.$textarea.trigger('init.oc.richeditor',[this])}
 RichEditor.prototype.getElement=function(){return this.$el}
 RichEditor.prototype.getEditor=function(){return this.editor}
 RichEditor.prototype.getTextarea=function(){return this.$textarea}
-RichEditor.prototype.getContent=function(){return this.$textarea.froalaEditor('html.get')}
-RichEditor.prototype.setContent=function(html){this.$textarea.froalaEditor('html.set',html)}
+RichEditor.prototype.getContent=function(){return this.editor.html.get()}
+RichEditor.prototype.setContent=function(html){this.editor.html.set(html)}
 RichEditor.prototype.syncContent=function(){this.editor.events.trigger('contentChanged')}
 RichEditor.prototype.updateLayout=function(){var $editor=$('.fr-wrapper',this.$el),$codeEditor=$('.fr-code',this.$el),$toolbar=$('.fr-toolbar',this.$el),$box=$('.fr-box',this.$el)
 if(!$editor.length){return}
@@ -557,7 +557,8 @@ RichEditor.prototype.insertUiBlock=function($node){this.$textarea.froalaEditor('
 RichEditor.prototype.insertVideo=function(url,title){this.$textarea.froalaEditor('figures.insertVideo',url,title)}
 RichEditor.prototype.insertAudio=function(url,title){this.$textarea.froalaEditor('figures.insertAudio',url,title)}
 RichEditor.prototype.onSetContent=function(ev,editor){this.$textarea.trigger('setContent.oc.richeditor',[this])}
-RichEditor.prototype.onSyncContent=function(ev,editor,html){var container={html:html}
+RichEditor.prototype.onSyncContent=function(ev,editor,html){if(editor.codeBeautifier){html=editor.codeBeautifier.run(html,editor.opts.codeBeautifierOptions)}
+var container={html:html}
 this.$textarea.trigger('syncContent.oc.richeditor',[this,container])
 return container.html}
 RichEditor.prototype.onFocus=function(){this.$el.addClass('editor-focus')}
diff --git a/modules/backend/formwidgets/richeditor/assets/js/richeditor.js b/modules/backend/formwidgets/richeditor/assets/js/richeditor.js
index ce3a37d36..f27c39ca5 100755
--- a/modules/backend/formwidgets/richeditor/assets/js/richeditor.js
+++ b/modules/backend/formwidgets/richeditor/assets/js/richeditor.js
@@ -227,11 +227,11 @@
     }
 
     RichEditor.prototype.getContent = function() {
-        return this.$textarea.froalaEditor('html.get')
+        return this.editor.html.get()
     }
 
     RichEditor.prototype.setContent = function(html) {
-        this.$textarea.froalaEditor('html.set', html)
+        this.editor.html.set(html)
     }
 
     RichEditor.prototype.syncContent = function() {
@@ -291,6 +291,11 @@
     }
 
     RichEditor.prototype.onSyncContent = function(ev, editor, html) {
+        // Beautify HTML.
+        if (editor.codeBeautifier) {
+            html = editor.codeBeautifier.run(html, editor.opts.codeBeautifierOptions)
+        }
+
         var container = {
             html: html
         }