From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Fri, 27 Jan 2017 20:30:21 +0000 (-0500)
Subject: Merge branch 'develop' into issue/#3062
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c38a5e443d42bc91355de64b9a3e4ce313e9ce47;p=friendica.git

Merge branch 'develop' into issue/#3062

* develop: (68 commits)
  Added documentation
  update to the translation
  update to the translations
  translation docs now contain basic usage of the Transifex client
  - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
  - Remove misc TinyMCE mentions in docs and minifyjs
  - Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter
  - Remove TinyMCE mentions in themes
  - Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value
  Remove tinyMCE libraries
  limit the description of the meta tag to 160 characters in /mod/display
  Improved handling of non string values in the config
  Bugfix: Caching of non string cache values now works.
  Reformatted stuff, improved query
  Auto-focus first input field of modal when shown
  Use cache instead of config for storing last proc_run time
  Some added logging
  Bugfix for masses of php warnings
  Rearranged the logging
  Some changed logging
  ...

# Conflicts:
#	view/theme/frost-mobile/js/theme.js
#	view/theme/frost/js/theme.js
---

c38a5e443d42bc91355de64b9a3e4ce313e9ce47
diff --cc view/theme/frost-mobile/js/theme.js
index 477bd44c03,a17dc1b2a4..abb2ed7c42
--- a/view/theme/frost-mobile/js/theme.js
+++ b/view/theme/frost-mobile/js/theme.js
@@@ -25,10 -27,10 +25,10 @@@ $(document).ready(function() 
  
  
  
 -	if(typeof window.AjaxUpload != "undefined") {
 +	if (typeof window.AjaxUpload != "undefined") {
  		var uploader = new window.AjaxUpload(
  			window.imageUploadButton,
- 			{ action: 'wall_upload/'+window.nickname+'?nomce=1',
+ 			{ action: 'wall_upload/' + window.nickname,
  				name: 'userfile',
  				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
  				onComplete: function(file,response) {
@@@ -38,10 -40,10 +38,10 @@@
  			}
  		);
  
 -		if($('#wall-file-upload').length) {
 +		if ($('#wall-file-upload').length) {
  			var file_uploader = new window.AjaxUpload(
  				'wall-file-upload',
- 				{ action: 'wall_attach/'+window.nickname+'?nomce=1',
+ 				{ action: 'wall_attach/' + window.nickname,
  					name: 'userfile',
  					onSubmit: function(file,ext) { $('#profile-rotator').show(); },
  					onComplete: function(file,response) {
@@@ -216,44 -227,39 +216,33 @@@ function initCrop() 
  
  
  function showEvent(eventid) {
 -/*	$.get(
 -		baseurl + window.eventModuleUrl + '/?id=' + eventid,
 -		function(data){
 -			$.colorbox({html:data});
 -		}
 -	);*/
  }
  
- 
- 
  /*
-  * 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) {
- 		if (plaintext == 'none') {
- 			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
- 			$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
- 			editor = true;
- 
- 			$("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();
- 			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;
- 		}
- 	} else {
- 		if (typeof cb!="undefined") cb();
+ 			return false;
+ 		});
+ 		$(".jothidden").show();
+ 
+ 		editor = true;
+ 	}
+ 	if (typeof callback != "undefined") {
+ 		callback();
  	}
  }
  
@@@ -424,9 -511,21 +411,9 @@@ function qCommentInsert(obj,id) 
  	$(obj).val("");
  }
  
- function insertFormatting(BBcode,id) {
 -/*function showHideCommentBox(id) {
 -	if( $('#comment-edit-form-' + id).is(':visible')) {
 -		$('#comment-edit-form-' + id).hide();
 -	}
 -	else {
 -		$('#comment-edit-form-' + id).show();
 -	}
 -}*/
 -
 -
 -function insertFormatting(comment,BBcode,id) {
 -
++function insertFormatting(BBcode, id) {
  	var tmpStr = $("#comment-edit-text-" + id).val();
 -	if(tmpStr == comment) {
 -		tmpStr = "";
 +	if (tmpStr == "") {
  		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
  		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
  		openMenu("comment-edit-submit-wrapper-" + id);
diff --cc view/theme/frost/js/theme.js
index a4a9758803,44dc700aba..52e181a622
--- a/view/theme/frost/js/theme.js
+++ b/view/theme/frost/js/theme.js
@@@ -12,7 -12,12 +12,7 @@@ $(document).ready(function() 
  		'#system-menu-list-closing': false
  	};
  
- 	/* enable tinymce on focus and click */
 -/*    $.ajaxSetup({
 -        cache: false
 -    });*/
 -
 -
+ 	/* enable editor on focus and click */
  	$("#profile-jot-text").focus(enableOnUser);
  	$("#profile-jot-text").click(enableOnUser);