merging changes from trunk to beta

01f89fc0 · Imran Hussain · 20c58208 · c32c4c25 · 01f89fc0
Commit 01f89fc0 authored Apr 22, 2015 by Imran Hussain
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

htdocs/js/tiny_mce.js htdocs/js/tiny_mce.js +2 -2

No files found.
--- a/htdocs/js/tiny_mce.js
+++ b/htdocs/js/tiny_mce.js
 tinyMCE.init({
-	mode: "textareas",
+	mode: "exact",
+	elements : "body",
 	height: "100%",
 	plugins: "safari,fullscreen,inlinepopups",
 	theme: "advanced",
@@ -267,4 +268,3 @@ valid_elements : ""
  +"|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style"
  +"|title]"
 })
-