- Remove TinyMCE mentions in themes

view/theme/frio/templates/event_head.tpl

@@ -72,51 +72,8 @@
 	var modparams = {{$modparams}}
 
 </script>
-
-{{if $editselect != 'none'}}
-<script language="javascript" type="text/javascript"
-	  src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
-
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "textareas",
-		plugins : "bbcode,paste",
-		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-		theme_advanced_buttons2 : "",
-		theme_advanced_buttons3 : "",
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "center",
-		theme_advanced_blockformats : "blockquote,code",
-		theme_advanced_resizing : true,
-		gecko_spellcheck : true,
-		paste_text_sticky : true,
-		entity_encoding : "raw",
-		add_unload_trigger : false,
-		remove_linebreaks : false,
-		forced_root_block : 'div',
-		content_css: "{{$baseurl}}/view/custom_tinymce.css",
-		theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-			});
-		}
-
-	});
-
 	$(document).ready(function() {
-		$('.comment-edit-bb').hide();
-	});
-{{else}}
-	<script language="javascript" type="text/javascript">
-{{/if}}
-
-	$(document).ready(function() {
-{{if $editselect = 'none'}}
 		$("#comment-edit-text-desc").bbco_autocomplete('bbcode');
-{{/if}}
-
 	});
-
 </script>

view/theme/frio/templates/jot-header.tpl

@@ -2,134 +2,37 @@
 <script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
 
 <script type="text/javascript">
-	var editor=false;
+	var editor = false;
 	var textlen = 0;
-	var plaintext = '{{$editselect}}';
 
-	function initEditor(cb){
+	function initEditor(callback) {
-		if (editor==false){
+		if (editor == false) {
 			$("#profile-jot-text-loading").show();
-			if(plaintext == 'none') {
+			$("#profile-jot-text-loading").hide();
-				$("#profile-jot-text-loading").hide();
+			//$("#profile-jot-text").addClass("profile-jot-text-full").removeClass("profile-jot-text-empty");
-				//$("#profile-jot-text").addClass("profile-jot-text-full").removeClass("profile-jot-text-empty");
+			$("#jot-category").show();
-				$("#jot-category").show();
+			$("#jot-category").addClass("jot-category-ex");
-				$("#jot-category").addClass("jot-category-ex");
+			$("#jot-profile-jot-wrapper").show();
-				$("#jot-profile-jot-wrapper").show();
+			$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
-				$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
+			$("#profile-jot-text").bbco_autocomplete('bbcode');
-				$("#profile-jot-text").bbco_autocomplete('bbcode');
-				editor = true;
-				$("a#jot-perms-icon").colorbox({
-					'inline' : true,
-					'transition' : 'elastic'
-				});
-				$(".jothidden").show();
-				if (typeof cb!="undefined") cb();
-				$("#profile-jot-text").keyup(function(){
-					var textlen = $(this).val().length;
-					$('#character-counter').text(textlen);
-				});
-				return;
-			}
-			tinyMCE.init({
-				theme : "advanced",
-				mode : "specific_textareas",
-				editor_selector: {{$editselect}},
-				auto_focus: "profile-jot-text",
-				plugins : "bbcode,paste,autoresize, inlinepopups",
-				theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-				theme_advanced_buttons2 : "",
-				theme_advanced_buttons3 : "",
-				theme_advanced_toolbar_location : "top",
-				theme_advanced_toolbar_align : "center",
-				theme_advanced_blockformats : "blockquote,code",
-				theme_advanced_resizing : true,
-				gecko_spellcheck : true,
-				paste_text_sticky : true,
-				entity_encoding : "raw",
-				add_unload_trigger : false,
-				remove_linebreaks : false,
-				//force_p_newlines : false,
-				//force_br_newlines : true,
-				forced_root_block : 'div',
-				convert_urls: false,
-				content_css: "{{$baseurl}}/view/custom_tinymce.css",
-				theme_advanced_path : false,
-				file_browser_callback : "fcFileBrowser",
-				setup : function(ed) {
-					cPopup = null;
-					ed.onKeyDown.add(function(ed,e) {
-						if(cPopup !== null)
-							cPopup.onkey(e);
-					});
-
-					ed.onKeyUp.add(function(ed, e) {
-						var txt = tinyMCE.activeEditor.getContent();
-						match = txt.match(/@([^ \n]+)$/);
-						if(match!==null) {
-							if(cPopup === null) {
-								cPopup = new ACPopup(this,baseurl+"/acl");
-							}
-							if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-							if(! cPopup.ready) cPopup = null;
-						}
-						else {
-							if(cPopup !== null) { cPopup.close(); cPopup = null; }
-						}
-
-						textlen = txt.length;
-						if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-							$('#profile-jot-desc').html(ispublic);
-						}
-						else {
-							$('#profile-jot-desc').html('&nbsp;');
-						}
-
-					 //Character count
-
-						if(textlen <= 140) {
-							$('#character-counter').removeClass('red');
-							$('#character-counter').removeClass('orange');
-							$('#character-counter').addClass('grey');
-						}
-						if((textlen > 140) && (textlen <= 420)) {
-							$('#character-counter').removeClass('grey');
-							$('#character-counter').removeClass('red');
-							$('#character-counter').addClass('orange');
-						}
-						if(textlen > 420) {
-							$('#character-counter').removeClass('grey');
-							$('#character-counter').removeClass('orange');
-							$('#character-counter').addClass('red');
-						}
-						$('#character-counter').text(textlen);
-					});
-
-					ed.onInit.add(function(ed) {
-						ed.pasteAsPlainText = true;
-						$("#profile-jot-text-loading").hide();
-						$(".jothidden").show();
-						if (typeof cb!="undefined") cb();
-					});
-
-				}
-
-			});
-			editor = true;
-
-			// setup acl popup
 			$("a#jot-perms-icon").colorbox({
 				'inline' : true,
 				'transition' : 'elastic'
 			});
+			$(".jothidden").show();
+			$("#profile-jot-text").keyup(function(){
+				var textlen = $(this).val().length;
+				$('#character-counter').text(textlen);
+			});
 
-		} else {
+			editor = true;
-			if (typeof cb!="undefined") cb();
+		}
+		if (typeof callback != "undefined") {
+			callback();
 		}
 	}
 
 	function enableOnUser(){
-		if (editor) return;
-		//$(this).val("");
 		initEditor();
 	}
 </script>
@@ -140,7 +43,7 @@
 
 	$(document).ready(function() {
 
-		/* enable tinymce on focus and click */
+		/* enable editor on focus and click */
 		$("#profile-jot-text").focus(enableOnUser);
 		$("#profile-jot-text").click(enableOnUser);
 
@@ -177,33 +80,6 @@
 			Dialog.doFileBrowser("main");
 			jotActive();
 		});
-
-		/**
-			var uploader = new window.AjaxUpload(
-				'wall-image-upload',
-				{ action: 'wall_upload/{{$nickname}}',
-					name: 'userfile',
-					onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-					onComplete: function(file,response) {
-						addeditortext(response);
-						$('#profile-rotator').hide();
-					}
-				}
-			);
-			var file_uploader = new window.AjaxUpload(
-				'wall-file-upload',
-				{ action: 'wall_attach/{{$nickname}}',
-					name: 'userfile',
-					onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-					onComplete: function(file,response) {
-						addeditortext(response);
-						$('#profile-rotator').hide();
-					}
-				}
-			);
-
-		}
-		**/
 	});
 
 	function deleteCheckedItems() {
@@ -377,18 +253,14 @@
 	}
 
 	function addeditortext(data) {
-		if(plaintext == 'none') {
+		// get the textfield
-			// get the textfield
+		var textfield = document.getElementById("profile-jot-text");
-			var textfield = document.getElementById("profile-jot-text");
+		// check if the textfield does have the default-value
-			// check if the textfield does have the default-value
+		jotTextOpenUI(textfield);
-			jotTextOpenUI(textfield);
+		// save already existent content
-			// save already existent content
+		var currentText = $("#profile-jot-text").val();
-			var currentText = $("#profile-jot-text").val();
+		//insert the data as new value
-			//insert the data as new value
+		textfield.value = currentText + data;
-			textfield.value = currentText + data;
-		}
-		else
-			tinyMCE.execCommand('mceInsertRawHTML',false,data);
 	}
 
 	{{$geotag}}

view/theme/frio/templates/msg-header.tpl

@@ -1,67 +1,14 @@
 
-
-<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
-
-var plaintext = '{{$editselect}}';
-
-if(plaintext != 'none') {
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "specific_textareas",
-		editor_selector: /(profile-jot-text|prvmail-text)/,
-		plugins : "bbcode,paste",
-		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-		theme_advanced_buttons2 : "",
-		theme_advanced_buttons3 : "",
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "center",
-		theme_advanced_blockformats : "blockquote,code",
-		theme_advanced_resizing : true,
-		gecko_spellcheck : true,
-		paste_text_sticky : true,
-		entity_encoding : "raw",
-		add_unload_trigger : false,
-		remove_linebreaks : false,
-		//force_p_newlines : false,
-		//force_br_newlines : true,
-		forced_root_block : 'div',
-		convert_urls: false,
-		content_css: "{{$baseurl}}/view/custom_tinymce.css",
-		     //Character count
-		theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-				var editorId = ed.editorId;
-				var textarea = $('#'+editorId);
-				if (typeof(textarea.attr('tabindex')) != "undefined") {
-					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
-					textarea.attr('tabindex', null);
-				}
-			});
-		}
-	});
-}
-else
 	$("#comment-edit-text-input").editor_autocomplete(baseurl+"/acl");
-
-
 </script>
 
 <script>
 	$(document).ready(function() {
-		{{if $editselect = 'none'}}
 		$("#comment-edit-text-input").bbco_autocomplete('bbcode');
-		{{/if}}
-
-		//var objDiv = document.getElementById("mail-conversation");
-		//objDiv.scrollTop = objDiv.scrollHeight;
 		$('#mail-conversation').perfectScrollbar();
 		$('#message-preview').perfectScrollbar();
 		$('#mail-conversation').scrollTop($('#mail-conversation')[0].scrollHeight);
-
-
 	});
 </script>
 

view/theme/frio/theme.php

@@ -16,9 +16,6 @@ function frio_init(App $a) {
 	// disable the events module link in the profile tab
 	$a->theme_events_in_profile = false;
 
-	// Disallow the richtext editor
-	$a->theme_richtext_editor = false;
-
 	set_template_engine($a, 'smarty3');
 
 	$baseurl = App::get_baseurl();

view/theme/frost-mobile/js/main.js

@@ -77,12 +77,8 @@
 			$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
 			$("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden");
 			input.val(val);
-			//console.log(id);
 		});
 
-		/* setup field_richtext */
-		/*setupFieldRichtext();*/
-
 		/* popup menus */
 		function close_last_popup_menu(e) {
 
@@ -562,7 +558,6 @@
 	function preview_post() {
 		$("#jot-preview").val("1");
 		$("#jot-preview-content").show();
-		tinyMCE.triggerSave();
 		$.post(
 			"item",
 			$("#profile-jot-form").serialize(),
@@ -650,58 +645,6 @@ function notifyMarkAll() {
 	});
 }
 
-
-// code from http://www.tinymce.com/wiki.php/How-to_implement_a_custom_file_browser
-function fcFileBrowser (field_name, url, type, win) {
-    /* TODO: If you work with sessions in PHP and your client doesn't accept cookies you might need to carry
-       the session name and session ID in the request string (can look like this: "?PHPSESSID=88p0n70s9dsknra96qhuk6etm5").
-       These lines of code extract the necessary parameters and add them back to the filebrowser URL again. */
-
-
-    var cmsURL = baseurl+"/fbrowser/"+type+"/";
-
-    tinyMCE.activeEditor.windowManager.open({
-        file : cmsURL,
-        title : 'File Browser',
-        width : 420,  // Your dimensions may differ - toy around with them!
-        height : 400,
-        resizable : "yes",
-        inline : "yes",  // This parameter only has an effect if you use the inlinepopups plugin!
-        close_previous : "no"
-    }, {
-        window : win,
-        input : field_name
-    });
-    return false;
-  }
-
-function setupFieldRichtext(){
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "specific_textareas",
-		editor_selector: "fieldRichtext",
-		plugins : "bbcode,paste, inlinepopups",
-		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-		theme_advanced_buttons2 : "",
-		theme_advanced_buttons3 : "",
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "center",
-		theme_advanced_blockformats : "blockquote,code",
-		paste_text_sticky : true,
-		entity_encoding : "raw",
-		add_unload_trigger : false,
-		remove_linebreaks : false,
-		//force_p_newlines : false,
-		//force_br_newlines : true,
-		forced_root_block : 'div',
-		convert_urls: false,
-		content_css: baseurl+"/view/custom_tinymce.css",
-		theme_advanced_path : false,
-		file_browser_callback : "fcFileBrowser",
-	});
-}
-
-
 /**
  * sprintf in javascript
  *	"{0} and {1}".format('zero','uno');

view/theme/frost-mobile/js/theme.js

@@ -1,47 +1,9 @@
 $(document).ready(function() {
 
-	/* enable tinymce on focus and click */
+	/* enable editor on focus and click */
 	$("#profile-jot-text").focus(enableOnUser);
 	$("#profile-jot-text").click(enableOnUser);
 
-/*$('html').click(function() { $("#nav-notifications-menu" ).hide(); });*/
-
-	/*$('.group-edit-icon').hover(
-		function() {
-			$(this).addClass('icon'); $(this).removeClass('iconspacer');},
-		function() {
-			$(this).removeClass('icon'); $(this).addClass('iconspacer');}
-	);
-
-	$('.sidebar-group-element').hover(
-		function() {
-			id = $(this).attr('id');
-			$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
-
-		function() {
-			id = $(this).attr('id');
-			$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
-	);
-
-
-	$('.savedsearchdrop').hover(
-		function() {
-			$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
-		function() {
-			$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
-	);
-
-	$('.savedsearchterm').hover(
-		function() {
-			id = $(this).attr('id');
-			$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
-
-		function() {
-			id = $(this).attr('id');
-			$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
-	);*/
-
-
 	$('#event-share-checkbox').change(function() {
 
 		if ($('#event-share-checkbox').is(':checked')) {
@@ -273,199 +235,49 @@ function showEvent(eventid) {
 	);*/
 }
 
-
-
 /*
- * TinyMCE/Editor
+ * Editor
  */
-
+var editor = false;
-var editor=false;
 var textlen = 0;
-var plaintext = 'none';//window.editSelect;
-//var ispublic = window.isPublic;
-
-function initEditor(cb){
-	if (editor==false){
-//		$("#profile-jot-text-loading").show();
-		if(plaintext == 'none') {
-//			$("#profile-jot-text-loading").hide();
-			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-			$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
-			editor = true;
-/*			$("a#jot-perms-icon").colorbox({
-				'inline' : true,
-				'transition' : 'elastic'
-			});*/
-			$("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
-				var parent = $("#profile-jot-acl-wrapper").parent();
-				if (parent.css('display') == 'none') {
-					parent.show();
-				} else {
-					parent.hide();
-				}
-//				$("#profile-jot-acl-wrapper").parent().toggle();
-				return false;
-			});
-			$(".jothidden").show();
-			if (typeof cb!="undefined") cb();
-			return;
-		}	
-/*		tinyMCE.init({
-			theme : "advanced",
-			mode : "specific_textareas",
-			editor_selector: window.editSelect,
-			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,autoresize, inlinepopups",
-			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-			theme_advanced_buttons2 : "",
-			theme_advanced_buttons3 : "",
-			theme_advanced_toolbar_location : "top",
-			theme_advanced_toolbar_align : "center",
-			theme_advanced_blockformats : "blockquote,code",
-			gecko_spellcheck : true,
-			paste_text_sticky : true,
-			entity_encoding : "raw",
-			add_unload_trigger : false,
-			remove_linebreaks : false,
-			//force_p_newlines : false,
-			//force_br_newlines : true,
-			forced_root_block : 'div',
-			convert_urls: false,
-			content_css: "$baseurl/view/custom_tinymce.css",
-			theme_advanced_path : false,
-			file_browser_callback : "fcFileBrowser",
-			setup : function(ed) {
-				cPopup = null;
-				ed.onKeyDown.add(function(ed,e) {
-					if(cPopup !== null)
-						cPopup.onkey(e);
-				});
-
-				ed.onKeyUp.add(function(ed, e) {
-					var txt = tinyMCE.activeEditor.getContent();
-					match = txt.match(/@([^ \n]+)$/);
-					if(match!==null) {
-						if(cPopup === null) {
-							cPopup = new ACPopup(this,baseurl+"/acl");
-						}
-						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-						if(! cPopup.ready) cPopup = null;
-					}
-					else {
-						if(cPopup !== null) { cPopup.close(); cPopup = null; }
-					}
-
-					textlen = txt.length;
-					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-						$('#profile-jot-desc').html(ispublic);
-					}
-					else {
-						$('#profile-jot-desc').html(' ');
-					}	 
-
-				 //Character count
-
-					if(textlen <= 140) {
-						$('#character-counter').removeClass('red');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('grey');
-					}
-					if((textlen > 140) && (textlen <= 420)) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('red');
-						$('#character-counter').addClass('orange');
-					}
-					if(textlen > 420) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('red');
-					}
-					$('#character-counter').text(textlen);
-				});
-
-				ed.onInit.add(function(ed) {
-					ed.pasteAsPlainText = true;
-					$("#profile-jot-text-loading").hide();
-					$(".jothidden").show();
-					if (typeof cb!="undefined") cb();
-				});
 
+function initEditor(callback){
+	if (editor == false) {
+		$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+		$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
+		$("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
+			var parent = $("#profile-jot-acl-wrapper").parent();
+			if (parent.css('display') == 'none') {
+				parent.show();
+			} else {
+				parent.hide();
 			}
+			return false;
 		});
+		$(".jothidden").show();
+
 		editor = true;
-		// setup acl popup
+	}
-		$("a#jot-perms-icon").colorbox({
+	if (typeof callback != "undefined") {
-			'inline' : true,
+		callback();
-			'transition' : 'elastic'
-		}); */
-	} else {
-		if (typeof cb!="undefined") cb();
 	}
 }
 
 function enableOnUser(){
-	if (editor) return;
+	if (editor) {
+		return;
+	}
 	$(this).val("");
 	initEditor();
 }
 
-/*function wallInitEditor() {
-	var plaintext = window.editSelect;
-
-	if(plaintext != 'none') {
-		tinyMCE.init({
-			theme : "advanced",
-			mode : "specific_textareas",
-			editor_selector: /(profile-jot-text|prvmail-text)/,
-			plugins : "bbcode,paste",
-			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-			theme_advanced_buttons2 : "",
-			theme_advanced_buttons3 : "",
-			theme_advanced_toolbar_location : "top",
-			theme_advanced_toolbar_align : "center",
-			theme_advanced_blockformats : "blockquote,code",
-			gecko_spellcheck : true,
-			paste_text_sticky : true,
-			entity_encoding : "raw",
-			add_unload_trigger : false,
-			remove_linebreaks : false,
-			//force_p_newlines : false,
-			//force_br_newlines : true,
-			forced_root_block : 'div',
-			convert_urls: false,
-			content_css: baseurl + "/view/custom_tinymce.css",
-				 //Character count
-			theme_advanced_path : false,
-			setup : function(ed) {
-				ed.onInit.add(function(ed) {
-					ed.pasteAsPlainText = true;
-					var editorId = ed.editorId;
-					var textarea = $('#'+editorId);
-					if (typeof(textarea.attr('tabindex')) != "undefined") {
-						$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
-						textarea.attr('tabindex', null);
-					}
-				});
-			}
-		});
-	}
-	else
-		$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
-}*/
-
-
-
 /*
  * Jot
  */
 
 function addeditortext(textElem, data) {
-	if(window.editSelect == 'none') {
+	var currentText = $(textElem).val();
-		var currentText = $(textElem).val();
+	$(textElem).val(currentText + data);
-		$(textElem).val(currentText + data);
-	}
-/*	else
-		tinyMCE.execCommand('mceInsertRawHTML',false,data);*/
 }
 
 function jotVideoURL() {

view/theme/frost-mobile/templates/jot-end.tpl

@@ -1,6 +1,4 @@
-
-
 <script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
 
-<script>if(typeof window.jotInit != 'undefined') initEditor();</script>
+<script language="javascript" type="text/javascript">if (typeof window.jotInit != 'undefined') initEditor();</script>
 

view/theme/frost-mobile/templates/jot-header.tpl

@@ -1,8 +1,6 @@
 
 
 <script>
-	var none = "none"; // ugly hack: {{$editselect}} shouldn't be a string if TinyMCE is enabled, but should if it isn't
-	window.editSelect = {{$editselect}};
 	window.isPublic = "{{$ispublic}}";
 	window.nickname = "{{$nickname}}";
 	window.linkURL = "{{$linkurl}}";

view/theme/frost-mobile/templates/msg-header.tpl

@@ -1,9 +1,7 @@
 
-
 <script language="javascript" type="text/javascript">
 	window.nickname = "{{$nickname}}";
 	window.linkURL = "{{$linkurl}}";
-	var plaintext = "none";
 	window.jotId = "#prvmail-text";
 	window.imageUploadButton = 'prvmail-upload';
 	window.autocompleteType = 'msg-header';

view/theme/frost-mobile/templates/profed_head.tpl

@@ -1,6 +0,0 @@
-
-
-<script language="javascript" type="text/javascript">
-	window.editSelect = "none";
-</script>
-

view/theme/frost-mobile/templates/wallmsg-header.tpl

@@ -1,8 +1,5 @@
 
-
 <script language="javascript" type="text/javascript">
-window.editSelect = "none";
 window.jotId = "#prvmail-text";
 window.imageUploadButton = 'prvmail-upload';
 </script>
-

view/theme/frost/TODO

@@ -2,7 +2,6 @@ Home page edit pencil
 Preview spacing
 Photo album display
 
-Check TinyMCE optimization
 "Profiles" page is wonky
 Settings, admin, photos upload don't look beautiful
 

view/theme/frost/js/main.js

@@ -80,9 +80,6 @@
 			//console.log(id);
 		});
 
-		/* setup field_richtext */
-		//setupFieldRichtext();
-
 		/* popup menus */
 		function close_last_popup_menu(e) {
 
@@ -578,7 +575,6 @@
 	function preview_post() {
 		$("#jot-preview").val("1");
 		$("#jot-preview-content").show();
-		tinyMCE.triggerSave();
 		$.post(
 			"item",
 			$("#profile-jot-form").serialize(),
@@ -666,58 +662,6 @@ function notifyMarkAll() {
 	});
 }
 
-
-// code from http://www.tinymce.com/wiki.php/How-to_implement_a_custom_file_browser
-function fcFileBrowser (field_name, url, type, win) {
-    /* TODO: If you work with sessions in PHP and your client doesn't accept cookies you might need to carry
-       the session name and session ID in the request string (can look like this: "?PHPSESSID=88p0n70s9dsknra96qhuk6etm5").
-       These lines of code extract the necessary parameters and add them back to the filebrowser URL again. */
-
-
-    var cmsURL = baseurl+"/fbrowser/"+type+"/";
-
-    tinyMCE.activeEditor.windowManager.open({
-        file : cmsURL,
-        title : 'File Browser',
-        width : 420,  // Your dimensions may differ - toy around with them!
-        height : 400,
-        resizable : "yes",
-        inline : "yes",  // This parameter only has an effect if you use the inlinepopups plugin!
-        close_previous : "no"
-    }, {
-        window : win,
-        input : field_name
-    });
-    return false;
-  }
-
-/*function setupFieldRichtext(){
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "specific_textareas",
-		editor_selector: "fieldRichtext",
-		plugins : "bbcode,paste, inlinepopups",
-		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-		theme_advanced_buttons2 : "",
-		theme_advanced_buttons3 : "",
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "center",
-		theme_advanced_blockformats : "blockquote,code",
-		paste_text_sticky : true,
-		entity_encoding : "raw",
-		add_unload_trigger : false,
-		remove_linebreaks : false,
-		//force_p_newlines : false,
-		//force_br_newlines : true,
-		forced_root_block : 'div',
-		convert_urls: false,
-		content_css: baseurl+"/view/custom_tinymce.css",
-		theme_advanced_path : false,
-		file_browser_callback : "fcFileBrowser",
-	});
-}*/
-
-
 /**
  * sprintf in javascript
  *	"{0} and {1}".format('zero','uno');

view/theme/frost/js/theme.js

@@ -17,7 +17,7 @@ $(document).ready(function() {
     });*/
 
 
-	/* enable tinymce on focus and click */
+	/* enable editor on focus and click */
 	$("#profile-jot-text").focus(enableOnUser);
 	$("#profile-jot-text").click(enableOnUser);
 
@@ -476,254 +476,52 @@ function hideNavMenu(menuID) {
 
 
 /*
- * TinyMCE/Editor
+ * Editor
  */
 
-function InitMCEEditor(editorData) {
-	var tinyMCEInitConfig = {
-		theme : "advanced",
-		//mode : // SPECIFIC
-		//editor_selector: // SPECIFIC
-		//elements: // SPECIFIC
-		plugins : "bbcode,paste,autoresize,inlinepopups",
-		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-		theme_advanced_buttons2 : "",
-		theme_advanced_buttons3 : "",
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "center",
-		theme_advanced_blockformats : "blockquote,code",
-		gecko_spellcheck : true,
-		paste_text_sticky : true, // COUPLED WITH paste PLUGIN
-		entity_encoding : "raw",
-		add_unload_trigger : false,
-		remove_linebreaks : false,
-		//force_p_newlines : false,
-		//force_br_newlines : true,
-		forced_root_block : 'div',
-		//convert_urls: false, //SPECIFIC?
-		content_css: baseurl + "/view/custom_tinymce.css",
-		theme_advanced_path : false,
-		file_browser_callback : "fcFileBrowser",
-		//setup : // SPECIFIC
-	};
-
-	if(window.editSelect != 'none') {
-		$.extend(tinyMCEInitConfig, editorData);
-		tinyMCE.init(tinyMCEInitConfig);
-	}
-	else if(typeof editorData.plaintextFn == 'function') {
-		(editorData.plaintextFn)();
-	}
-}
-
 var editor = false;
 var textlen = 0;
 
-function initEditor(cb){
+function initEditor(callback) {
-	if(editor==false) {
+	if(editor == false) {
-		editor = true;
 		$("#profile-jot-text-loading").show();
 
-		var editorData = {
+		$("#profile-jot-text-loading").hide();
-			mode : "specific_textareas",
+		$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-			editor_selector : "profile-jot-text",
+		$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
-			auto_focus : "profile-jot-text",
+		$(".jothidden").show();
-			//plugins : "bbcode,paste,autoresize,inlinepopups",
-			//paste_text_sticky : true,
-			convert_urls : false,
-			setup : function(ed) {
-				cPopup = null;
-				ed.onKeyDown.add(function(ed,e) {
-					if(cPopup !== null)
-						cPopup.onkey(e);
-				});
-
-				ed.onKeyUp.add(function(ed, e) {
-					var txt = tinyMCE.activeEditor.getContent();
-					match = txt.match(/@([^ \n]+)$/);
-					if(match!==null) {
-						if(cPopup === null) {
-							cPopup = new ACPopup(this,baseurl+"/acl");
-						}
-						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-						if(! cPopup.ready) cPopup = null;
-					}
-					else {
-						if(cPopup !== null) { cPopup.close(); cPopup = null; }
-					}
-
-					textlen = txt.length;
-					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-						$('#profile-jot-desc').html(window.isPublic);
-					}
-					else {
-						$('#profile-jot-desc').html(' ');
-					}	 
-
-				 //Character count
-
-					if(textlen <= 140) {
-						$('#character-counter').removeClass('red');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('grey');
-					}
-					if((textlen > 140) && (textlen <= 420)) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('red');
-						$('#character-counter').addClass('orange');
-					}
-					if(textlen > 420) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('red');
-					}
-					$('#character-counter').text(textlen);
-				});
-
-				ed.onInit.add(function(ed) {
-					ed.pasteAsPlainText = true;
-					$("#profile-jot-text-loading").hide();
-					$(".jothidden").show();
-					if (typeof cb!="undefined") cb();
-				});
-
-			},
-			plaintextFn : function() {
-				$("#profile-jot-text-loading").hide();
-				$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-				$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
-				$(".jothidden").show();
-				if (typeof cb!="undefined") cb();
-			}
-		};
-		InitMCEEditor(editorData);
-
 		// setup acl popup
 		$("a#jot-perms-icon").colorbox({
 			'inline' : true,
 			'transition' : 'elastic'
 		});
-	} else {
+
-		if (typeof cb!="undefined") cb();
+		editor = true;
+	}
+	if (typeof callback != "undefined") {
+		callback();
 	}
 }
 
-function enableOnUser(){
+function enableOnUser() {
-	if (editor) return;
+	if (editor) {
+		return;
+	}
 	$(this).val("");
 	initEditor();
 }
 
-
 function msgInitEditor() {
-	var editorData = {
+	$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
-		mode : "specific_textareas",
-		editor_selector : "prvmail-text",
-		//plugins : "bbcode,paste",
-		//paste_text_sticky : true,
-		convert_urls : false,
-		//theme_advanced_path : false,
-		setup : function(ed) {
-			cPopup = null;
-			ed.onKeyDown.add(function(ed,e) {
-				if(cPopup !== null)
-					cPopup.onkey(e);
-			});
-
-			ed.onKeyUp.add(function(ed, e) {
-				var txt = tinyMCE.activeEditor.getContent();
-				match = txt.match(/@([^ \n]+)$/);
-				if(match!==null) {
-					if(cPopup === null) {
-						cPopup = new ACPopup(this,baseurl+"/acl");
-					}
-					if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-					if(! cPopup.ready) cPopup = null;
-				}
-				else {
-					if(cPopup !== null) { cPopup.close(); cPopup = null; }
-				}
-
-				textlen = txt.length;
-				if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-					$('#profile-jot-desc').html(window.isPublic);
-				}
-				else {
-					$('#profile-jot-desc').html('&nbsp;');
-				}	 
-			});
-
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-				var editorId = ed.editorId;
-				var textarea = $('#'+editorId);
-				if (typeof(textarea.attr('tabindex')) != "undefined") {
-					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
-					textarea.attr('tabindex', null);
-				}
-			});
-		},
-		plaintextFn : function() {
-			$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
-		}
-	}
-	InitMCEEditor(editorData);
 }
 
-
-function contactInitEditor() {
-	var editorData = {
-		mode : "exact",
-		elements : "contact-edit-info",
-		//plugins : "bbcode"
-	}
-	InitMCEEditor(editorData);
-}
-
-
-function eventInitEditor() {
-	var editorData = {
-		mode : "textareas",
-		//plugins : "bbcode,paste",
-		//paste_text_sticky : true,
-		//theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-			});
-		}
-	}
-	InitMCEEditor(editorData);
-}
-
-
-function profInitEditor() {
-	var editorData = {
-		mode : "textareas",
-		//plugins : "bbcode,paste",
-		//paste_text_sticky : true,
-		//theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-			});
-		}
-	}
-	InitMCEEditor(editorData);
-}
-
-
 /*
  * Jot
  */
 
 function addeditortext(textElem, data) {
-	if(window.editSelect == 'none') {
+	var currentText = $(textElem).val();
-		var currentText = $(textElem).val();
+	$(textElem).val(currentText + data);
-		$(textElem).val(currentText + data);
-	}
-	else
-		tinyMCE.execCommand('mceInsertRawHTML',false,data);
 }
 
 function jotVideoURL() {

view/theme/frost/templates/contact_end.tpl

@@ -1,3 +0,0 @@
-
-<script language="javascript" type="text/javascript">contactInitEditor();</script>
-

view/theme/frost/templates/contact_head.tpl

@@ -1,5 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-window.editSelect = "{{$editselect}}";
-</script>
-

view/theme/frost/templates/end.tpl

@@ -2,12 +2,6 @@
 <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
-{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>-->*}}
-{{*<!--<script type="text/javascript">
-  tinyMCE.init({ mode : "none"});
-</script>-->*}}
-
-<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
 
 <script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/jquery.divgrow-1.3.1.f1.min.js" ></script>

view/theme/frost/templates/event_end.tpl

@@ -2,5 +2,3 @@
 <script type="text/javascript" src="{{$baseurl}}/library/moment/moment.min.js"></script>
 <script type="text/javascript" src="{{$baseurl}}/library/moment/locales.min.js"></script>
 <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
-
-<script language="javascript" type="text/javascript">eventInitEditor();</script>

view/theme/frost/templates/event_head.tpl

@@ -3,7 +3,6 @@
 
 <script language="javascript" type="text/javascript">
 window.aclType = 'event_head';
-window.editSelect = "{{$editselect}}";
 window.eventModuleUrl = "{{$module_url}}";
 window.eventModeParams = "{{$modparams}}" ;
 </script>

view/theme/frost/templates/jot-header.tpl

@@ -1,7 +1,6 @@
 
 
 <script>
-	window.editSelect = "{{$editselect}}";
 	window.isPublic = "{{$ispublic}}";
 	window.nickname = "{{$nickname}}";
 	window.linkURL = "{{$linkurl}}";

view/theme/frost/templates/msg-header.tpl

@@ -3,7 +3,6 @@
 <script language="javascript" type="text/javascript">
 	window.nickname = "{{$nickname}}";
 	window.linkURL = "{{$linkurl}}";
-	window.editSelect = "{{$editselect}}";
 	window.jotId = "#prvmail-text";
 	window.imageUploadButton = 'prvmail-upload';
 	window.autocompleteType = 'msg-header';

view/theme/frost/templates/profed_end.tpl

@@ -2,7 +2,6 @@
 <script type="text/javascript" src="js/country.js" ></script>
 
 <script language="javascript" type="text/javascript">
-profInitEditor();
 Fill_Country('{{$country_name}}');
 Fill_States('{{$region}}');
 </script>

view/theme/frost/templates/profed_head.tpl

@@ -1,6 +0,0 @@
-
-
-<script language="javascript" type="text/javascript">
-	window.editSelect = "{{$editselect}}";
-</script>
-

view/theme/frost/templates/wallmsg-header.tpl

@@ -1,7 +1,6 @@
 
 
 <script language="javascript" type="text/javascript">
-window.editSelect = "{{$editselect}}";
 window.jotId = "#prvmail-text";
 window.imageUploadButton = 'prvmail-upload';
 </script>

view/theme/smoothly/templates/jot-header.tpl

@@ -2,150 +2,46 @@
 
 <script language="javascript" type="text/javascript">
 
-var editor=false;
+var editor = false;
 var textlen = 0;
-var plaintext = '{{$editselect}}';
 
-function initEditor(cb){
+function initEditor(callback) {
-	if (editor==false){
+	if (editor == false){
 		$("#profile-jot-text-loading").show();
-		if(plaintext == 'none') {
+		$("#profile-jot-text-loading").hide();
-			$("#profile-jot-text-loading").hide();
+		$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-            		$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+		$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
-			$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
+		$("#profile-jot-text").bbco_autocomplete('bbcode');
-			$("#profile-jot-text").bbco_autocomplete('bbcode');
+		$(".jothidden").show();
-            		$(".jothidden").show();
+		$("a#jot-perms-icon").colorbox({
-            		editor = true;
-            		$("a#jot-perms-icon").colorbox({
-						'inline' : true,
-						'transition' : 'elastic'
-            		});
-	                            $("#profile-jot-submit-wrapper").show();
-								{{if $newpost}}
-    	                            $("#profile-upload-wrapper").show();
-        	                        $("#profile-attach-wrapper").show();
-            	                    $("#profile-link-wrapper").show();
-                	                $("#profile-video-wrapper").show();
-                    	            $("#profile-audio-wrapper").show();
-                        	        $("#profile-location-wrapper").show();
-                            	    $("#profile-nolocation-wrapper").show();
-                                	$("#profile-title-wrapper").show();
-	                                $("#profile-jot-plugin-wrapper").show();
-	                                $("#jot-preview-link").show();
-								{{/if}}   
-
-
-			if (typeof cb!="undefined") cb();
-			return;
-        }
-        tinyMCE.init({
-                theme : "advanced",
-                mode : "specific_textareas",
-                editor_selector: /(profile-jot-text|prvmail-text)/,
-                plugins : "bbcode,paste,fullscreen,autoresize",
-                theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
-                theme_advanced_buttons2 : "",
-                theme_advanced_buttons3 : "",
-                theme_advanced_toolbar_location : "top",
-                theme_advanced_toolbar_align : "center",
-                theme_advanced_blockformats : "blockquote,code",
-                //theme_advanced_resizing : true,
-                //theme_advanced_statusbar_location : "bottom",
-                paste_text_sticky : true,
-                entity_encoding : "raw",
-                add_unload_trigger : false,
-                remove_linebreaks : false,
-                //force_p_newlines : false,
-                //force_br_newlines : true,
-                forced_root_block : 'div',
-                convert_urls: false,
-                content_css: "{{$baseurl}}/view/custom_tinymce.css",
-                theme_advanced_path : false,
-                setup : function(ed) {
-					cPopup = null;
-					ed.onKeyDown.add(function(ed,e) {
-						if(cPopup !== null)
-							cPopup.onkey(e);
-					});
-
-
-
-					ed.onKeyUp.add(function(ed, e) {
-						var txt = tinyMCE.activeEditor.getContent();
-						match = txt.match(/@([^ \n]+)$/);
-						if(match!==null) {
-							if(cPopup === null) {
-								cPopup = new ACPopup(this,baseurl+"/acl");
-							}
-							if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-							if(! cPopup.ready) cPopup = null;
-						}
-						else {
-							if(cPopup !== null) { cPopup.close(); cPopup = null; }
-						}
-
-						textlen = txt.length;
-						if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-							$('#profile-jot-desc').html(ispublic);
-						}
-                        else {
-                            $('#profile-jot-desc').html('&nbsp;');
-                        }
-
-				//Character count
-
-                                if(textlen <= 140) {
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('grey');
-                                }
-                                if((textlen > 140) && (textlen <= 420)) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').addClass('orange');
-                                }
-                                if(textlen > 420) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('red');
-                                }
-                                $('#character-counter').text(textlen);
-                        });
-                        ed.onInit.add(function(ed) {
-                                ed.pasteAsPlainText = true;
-								$("#profile-jot-text-loading").hide();
-								$(".jothidden").show();
-	                            $("#profile-jot-submit-wrapper").show();
-								{{if $newpost}}
-    	                            $("#profile-upload-wrapper").show();
-        	                        $("#profile-attach-wrapper").show();
-            	                    $("#profile-link-wrapper").show();
-                	                $("#profile-video-wrapper").show();
-                    	            $("#profile-audio-wrapper").show();
-                        	        $("#profile-location-wrapper").show();
-                            	    $("#profile-nolocation-wrapper").show();
-                                	$("#profile-title-wrapper").show();
-	                                $("#profile-jot-plugin-wrapper").show();
-	                                $("#jot-preview-link").show();
-								{{/if}}   
-                             $("#character-counter").show();
-                                if (typeof cb!="undefined") cb();
-                        });
-                }
-        });
-        editor = true;
-        // setup acl popup
-        $("a#jot-perms-icon").colorbox({
 			'inline' : true,
 			'transition' : 'elastic'
-        }); 
+		});
-    } else {
+		$("#profile-jot-submit-wrapper").show();
-        if (typeof cb!="undefined") cb();
+	{{if $newpost}}
+		$("#profile-upload-wrapper").show();
+		$("#profile-attach-wrapper").show();
+		$("#profile-link-wrapper").show();
+		$("#profile-video-wrapper").show();
+		$("#profile-audio-wrapper").show();
+		$("#profile-location-wrapper").show();
+		$("#profile-nolocation-wrapper").show();
+		$("#profile-title-wrapper").show();
+		$("#profile-jot-plugin-wrapper").show();
+		$("#jot-preview-link").show();
+	{{/if}}
+
+		editor = true;
     }
+	if (typeof callback != "undefined") {
+		callback();
+	}
 } // initEditor
 
 function enableOnUser(){
-	if (editor) return;
+	if (editor) {
+		return;
+	}
 	$(this).val("");
 	initEditor();
 }
@@ -160,7 +56,7 @@ function enableOnUser(){
 
 	$(document).ready(function() {
 
-		/* enable tinymce on focus and click */
+		/* enable editor on focus and click */
 		$("#profile-jot-text").focus(enableOnUser);
 		$("#profile-jot-text").click(enableOnUser);
 
@@ -361,14 +257,10 @@ function enableOnUser(){
 		$('#profile-nolocation-wrapper').hide();
 	}
 
-  function addeditortext(data) {
+	function addeditortext(data) {
-        if(plaintext == 'none') {
+		var currentText = $("#profile-jot-text").val();
-            var currentText = $("#profile-jot-text").val();
+		$("#profile-jot-text").val(currentText + data);
-            $("#profile-jot-text").val(currentText + data);
+	}
-        }
-        else
-            tinyMCE.execCommand('mceInsertRawHTML',false,data);
-    }
 
 
 	{{$geotag}}