Merge branch 'pull'

1 files changed, 13 insertions, 4 deletions

diff --git a/include/main.js b/include/main.js
index 896c611d5..040e9695e 100644
--- a/include/main.js
+++ b/include/main.js
@@ -53,8 +53,11 @@
 			//console.log(id);
 		});
 		
+		/* setup field_richtext */
+		setupFieldRichtext();
+		
 		/* load tinyMCE if needed and setup field_richtext */
-		if(typeof tinyMCE == "undefined") {
+		/*if(typeof tinyMCE == "undefined") {
 			window.tinyMCEPreInit = {
 				suffix:"",
 				base: baseurl+"/library/tinymce/jscripts/tiny_mce/",
@@ -62,8 +65,8 @@
 			};
 			$.getScript(baseurl	+"/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js", setupFieldRichtext);
 		} else {
-			setupFieldRichtext();
-		}
+		}*/
+		
 		
 		
 		/* nav update event  */
@@ -364,7 +367,6 @@ function setupFieldRichtext(){
 	});
 }
 
-
 /** 
  * sprintf in javascript 
  *	"{0} and {1}".format('zero','uno'); 
@@ -377,3 +379,10 @@ String.prototype.format = function() {
     }
     return formatted;
 };
+// Array Remove
+Array.prototype.remove = function(item) {
+  to=undefined; from=this.indexOf(item);
+  var rest = this.slice((to || from) + 1 || this.length);
+  this.length = from < 0 ? this.length + from : from;
+  return this.push.apply(this, rest);
+};