Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 14:30:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into issue/#3062

Browse source 
* 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
This commit is contained in:
Hypolite Petovan 2017-01-27 15:30:21 -05:00
commit c38a5e443d
438 changed files with 108865 additions and 144355 deletions
Download patch file Download diff file Expand all files Collapse all files

67
view/theme/frost-mobile/js/theme.js
View file

@ -1,6 +1,6 @@
$(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);
@ -28,7 +28,7 @@ $(document).ready(function() {
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) {
@ -41,7 +41,7 @@ $(document).ready(function() {
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) {
@ -218,46 +218,35 @@ function initCrop() {
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) {
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();
}
}
function enableOnUser() {
function enableOnUser(){
if (editor) {
return;
}
@ -270,10 +259,8 @@ function enableOnUser() {
*/
function addeditortext(textElem, data) {
if (window.editSelect == 'none') {
var currentText = $(textElem).val();
$(textElem).val(currentText + data);
}
var currentText = $(textElem).val();
$(textElem).val(currentText + data);
}
function jotVideoURL() {
@ -424,7 +411,7 @@ function qCommentInsert(obj,id) {
$(obj).val("");
}
function insertFormatting(BBcode,id) {
function insertFormatting(BBcode, id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");