bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Cleaning up, actual changes are in the next commits

Browse source 
- Formatting
- Trailing spaces
- Extraneous blank lines
- Large comments
This commit is contained in:
Hypolite Petovan 2017-01-08 01:49:13 +11:00
commit daa8e4f901
28 changed files with 315 additions and 828 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,47 +4,8 @@ $(document).ready(function() {
$("#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')) {
if ($('#event-share-checkbox').is(':checked')) {
$('#acl-wrapper').show();
}
else {
@ -52,7 +13,6 @@ $(document).ready(function() {
}
}).trigger('change');
$(".popupbox").click(function () {
var parent = $( $(this).attr('href') ).parent();
if (parent.css('display') == 'none') {
@ -65,7 +25,7 @@ $(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',
@ -74,11 +34,11 @@ $(document).ready(function() {
onComplete: function(file,response) {
addeditortext(window.jotId, response);
$('#profile-rotator').hide();
}
}
}
);
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',
@ -87,14 +47,14 @@ $(document).ready(function() {
onComplete: function(file,response) {
addeditortext(window.jotId, response);
$('#profile-rotator').hide();
}
}
}
);
}
}
if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){
if (typeof window.aclInit !="undefined" && typeof acl=="undefined") {
acl = new ACL(
baseurl+"/acl",
[ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
@ -111,13 +71,13 @@ $(document).ready(function() {
$("#contacts-search").contact_autocomplete(baseurl + '/acl', 'a', true);
$("#contacts-search").keyup(function(event){
if(event.keyCode == 13){
$("#contacts-search").keyup(function(event) {
if (event.keyCode == 13) {
$("#contacts-search").click();
}
});
$(".autocomplete-w1 .selected").keyup(function(event){
if(event.keyCode == 13){
$(".autocomplete-w1 .selected").keyup(function(event) {
if (event.keyCode == 13) {
$("#contacts-search").click();
}
});
@ -129,16 +89,7 @@ $(document).ready(function() {
break;
}
/* if(window.autoCompleteType == "display-head") {
//$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
// make auto-complete work in more places
//$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
$(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
}*/
if(window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
if (window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
@ -146,7 +97,7 @@ $(document).ready(function() {
$('#jot-perms-icon').removeClass('unlock').addClass('lock');
$('#jot-public').hide();
});
if(selstr == null) {
if (selstr == null) {
$('#jot-perms-icon').removeClass('lock').addClass('unlock');
$('#jot-public').show();
}
@ -154,23 +105,23 @@ $(document).ready(function() {
}).trigger('change');
}
if(window.aclType == "event_head") {
if (window.aclType == "event_head") {
$('#events-calendar').fullCalendar({
events: baseurl + window.eventModuleUrl +'/json/',
header: {
left: 'prev,next today',
center: 'title',
right: 'month,agendaWeek,agendaDay'
},
},
timeFormat: 'H(:mm)',
eventClick: function(calEvent, jsEvent, view) {
showEvent(calEvent.id);
},
eventRender: function(event, element, view) {
//console.log(view.name);
if (event.item['author-name']==null) return;
switch(view.name){
switch(view.name) {
case "month":
element.find(".fc-title").html(
"<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(
@ -199,9 +150,9 @@ $(document).ready(function() {
break;
}
}
});
// center on date
var args=location.href.replace(baseurl,"").split("/");
if (args.length>=5 && window.eventModeParams == 2) {
@ -209,18 +160,18 @@ $(document).ready(function() {
} else if (args.length>=4 && window.eventModeParams == 1) {
$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
}
// show event popup
var hash = location.hash.split("-")
if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
}
}
});
// update pending count //
$(function(){
$(function() {
$("nav").bind('nav-update', function(e,data){
$("nav").bind('nav-update', function(e,data) {
var elm = $('#pending-update');
var register = $(data).find('register').text();
if (register=="0") { register=""; elm.hide();} else { elm.show(); }
@ -231,7 +182,7 @@ $(function(){
function homeRedirect() {
$('html').fadeOut('slow', function(){
$('html').fadeOut('slow', function() {
window.location = baseurl + "/login";
});
}
@ -265,12 +216,6 @@ function initCrop() {
function showEvent(eventid) {
/* $.get(
baseurl + window.eventModuleUrl + '/?id=' + eventid,
function(data){
$.colorbox({html:data});
}
);*/
}
@ -284,18 +229,13 @@ 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();
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").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') {
@ -303,181 +243,49 @@ function initEditor(cb){
} 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('&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();
});
if (typeof cb!="undefined") {
cb();
}
});
editor = true;
// setup acl popup
$("a#jot-perms-icon").colorbox({
'inline' : true,
'transition' : 'elastic'
}); */
return;
}
} else {
if (typeof cb!="undefined") cb();
}
}
function enableOnUser(){
if (editor) return;
function enableOnUser() {
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') {
if (window.editSelect == 'none') {
var currentText = $(textElem).val();
$(textElem).val(currentText + data);
}
/* else
tinyMCE.execCommand('mceInsertRawHTML',false,data);*/
}
function jotVideoURL() {
reply = prompt(window.vidURL);
if(reply && reply.length) {
if (reply && reply.length) {
addeditortext("#profile-jot-text", '[video]' + reply + '[/video]');
}
}
function jotAudioURL() {
reply = prompt(window.audURL);
if(reply && reply.length) {
if (reply && reply.length) {
addeditortext("#profile-jot-text", '[audio]' + reply + '[/audio]');
}
}
@ -485,7 +293,7 @@ function jotAudioURL() {
function jotGetLocation() {
reply = prompt(window.whereAreU, $('#jot-location').val());
if(reply && reply.length) {
if (reply && reply.length) {
$('#jot-location').val(reply);
}
}
@ -496,7 +304,7 @@ function jotShare(id) {
$('#like-rotator-' + id).show();
$.get('share/' + id, function(data) {
if (!editor) $("#profile-jot-text").val("");
initEditor(function(){
initEditor(function() {
addeditortext("#profile-jot-text", data);
$('#like-rotator-' + id).hide();
$(window).scrollTop(0);
@ -507,7 +315,7 @@ function jotShare(id) {
function jotGetLink() {
reply = prompt(window.linkURL);
if(reply && reply.length) {
if (reply && reply.length) {
reply = bin2hex(reply);
$('#profile-rotator').show();
$.get('parse_url?binurl=' + reply, function(data) {
@ -517,35 +325,12 @@ function jotGetLink() {
}
}
/*function linkdropper(event) {
var linkFound = event.dataTransfer.types.contains("text/uri-list");
if(linkFound)
event.preventDefault();
}
function linkdrop(event) {
var reply = event.dataTransfer.getData("text/uri-list");
event.target.textContent = reply;
event.preventDefault();
if(reply && reply.length) {
reply = bin2hex(reply);
$('#profile-rotator').show();
$.get('parse_url?binurl=' + reply, function(data) {
//if (!editor) $("#profile-jot-text").val("");
//initEditor(function(){
addeditortext(window.jotId, data);
$('#profile-rotator').hide();
//});
});
}
}*/
function jotClearLocation() {
$('#jot-coord').val('');
$('#profile-nolocation-wrapper').hide();
}
if(typeof window.geoTag === 'function') window.geoTag();
if (typeof window.geoTag === 'function') window.geoTag();
@ -555,35 +340,17 @@ if(typeof window.geoTag === 'function') window.geoTag();
function confirmDelete() { return confirm(window.delItem); }
/*function deleteCheckedItems() {
var checkedstr = '';
$('.item-select').each( function() {
if($(this).is(':checked')) {
if(checkedstr.length != 0) {
checkedstr = checkedstr + ',' + $(this).val();
}
else {
checkedstr = $(this).val();
}
}
});
$.post('item', { dropitems: checkedstr }, function(data) {
window.location.reload();
});
}*/
function itemTag(id) {
reply = prompt(window.term);
if(reply && reply.length) {
if (reply && reply.length) {
reply = reply.replace('#','');
if(reply.length) {
if (reply.length) {
commentBusy = true;
$('body').css('cursor', 'wait');
$.get('tagger/' + id + '?term=' + reply, NavUpdate);
/*if(timer) clearTimeout(timer);
/*if (timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);*/
liking = 1;
}
@ -591,61 +358,23 @@ function itemTag(id) {
}
function itemFiler(id) {
$.get('filer/', function(data){
$.get('filer/', function(data) {
var promptText = $('#id_term_label', data).text();
reply = prompt(promptText);
if(reply && reply.length) {
if (reply && reply.length) {
commentBusy = true;
$('body').css('cursor', 'wait');
$.get('filer/' + id + '?term=' + reply, NavUpdate);
/* if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);*/
liking = 1;
/* $.colorbox.close();*/
}
});
/* var bordercolor = $("input").css("border-color");
$.get('filer/', function(data){
$.colorbox({html:data});
$("#id_term").keypress(function(){
$(this).css("border-color",bordercolor);
})
$("#select_term").change(function(){
$("#id_term").css("border-color",bordercolor);
})
$("#filer_save").click(function(e){
e.preventDefault();
reply = $("#id_term").val();
if(reply && reply.length) {
commentBusy = true;
$('body').css('cursor', 'wait');
$.get('filer/' + id + '?term=' + reply);
if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);
liking = 1;
$.colorbox.close();
} else {
$("#id_term").css("border-color","#FF0000");
}
return false;
});
});
*/
}
/*
* Comments
*/
function commentOpen(obj,id) {
if(obj.value == window.commentEmptyText) {
obj.value = "";
@ -699,16 +428,6 @@ function qCommentInsert(obj,id) {
$(obj).val("");
}
/*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) {
var tmpStr = $("#comment-edit-text-" + id).val();
@ -745,5 +464,3 @@ function cmtBbOpen(id) {
function cmtBbClose(id) {
$(".comment-edit-bb-" + id).hide();
}