[SUCS Devel] site r690 - in branches/beta: . htdocs/js

[imranh at sucs.org]

Author: imranh
Date: 2015-04-22 13:22:22 +0100 (Wed, 22 Apr 2015)
New Revision: 690

Modified:
   branches/beta/
   branches/beta/htdocs/js/tiny_mce.js
Log:
merging changes from trunk to beta


Property changes on: branches/beta
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/imranh:590-591
/branches/sucs-site:318-680
/branches/sucs-site/branches/sucs-site:590-591
/trunk:660-684
   + /branches/imranh:590-591
/branches/sucs-site:318-680
/branches/sucs-site/branches/sucs-site:590-591
/trunk:660-689

Modified: branches/beta/htdocs/js/tiny_mce.js
===================================================================
--- branches/beta/htdocs/js/tiny_mce.js	2015-04-22 11:42:30 UTC (rev 689)
+++ branches/beta/htdocs/js/tiny_mce.js	2015-04-22 12:22:22 UTC (rev 690)
@@ -1,5 +1,6 @@
 tinyMCE.init({
-	mode: "textareas",
+	mode: "exact",
+	elements : "body",
 	height: "100%",
 	plugins: "safari,fullscreen,inlinepopups",
 	theme: "advanced",
@@ -267,4 +268,3 @@
   +"|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style"
   +"|title]"
 })
-