X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js%2Fmain.js;h=23f63f8224616274d08e5c61c45e0d4dae5eb39d;hb=6eb4254d06a1c261b0a46283b1952a6e6182537b;hp=ac238bf6aa65d568702491da2a8b46cf359c5864;hpb=44f4b4b9d1bd28a8c77e9f851e85fdb22c8fd8b1;p=friendica.git
diff --git a/js/main.js b/js/main.js
index ac238bf6aa..23f63f8224 100644
--- a/js/main.js
+++ b/js/main.js
@@ -21,7 +21,7 @@
var src = null;
var prev = null;
var livetime = null;
- var msie = false;
+ var force_update = false;
var stopped = false;
var totStopped = false;
var timer = null;
@@ -36,8 +36,6 @@
$(function() {
$.ajaxSetup({cache: false});
- msie = $.browser.msie ;
-
/* setup tooltips *//*
$("a,.tt").each(function(){
var e = $(this);
@@ -73,35 +71,43 @@
setupFieldRichtext();
/* popup menus */
+ function close_last_popup_menu() {
+ if(last_popup_menu) {
+ last_popup_menu.hide();
+ last_popup_button.removeClass("selected");
+ last_popup_menu = null;
+ last_popup_button = null;
+ }
+ }
$('a[rel^=#]').click(function(e){
+ e.preventDefault();
+ var parent = $(this).parent();
+ var isSelected = (last_popup_button && parent.attr('id') == last_popup_button.attr('id'));
+ close_last_popup_menu();
+ if(isSelected) return false;
menu = $( $(this).attr('rel') );
e.preventDefault();
e.stopPropagation();
if (menu.attr('popup')=="false") return false;
- $(this).parent().toggleClass("selected");
+ parent.toggleClass("selected");
menu.toggle();
if (menu.css("display") == "none") {
last_popup_menu = null;
last_popup_button = null;
} else {
last_popup_menu = menu;
- last_popup_button = $(this).parent();
+ last_popup_button = parent;
}
return false;
});
$('html').click(function() {
- if(last_popup_menu) {
- last_popup_menu.hide();
- last_popup_button.removeClass("selected");
- last_popup_menu = null;
- last_popup_button = null;
- }
+ close_last_popup_menu();
});
// fancyboxes
- $("a.popupbox").fancybox({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
+ $("a.popupbox").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
@@ -113,6 +119,9 @@
/* nav update event */
$('nav').bind('nav-update', function(e,data){;
+ var invalid = $(data).find('invalid').text();
+ if(invalid == 1) { window.location.href=window.location.href }
+
var net = $(data).find('net').text();
if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
$('#net-update').html(net);
@@ -137,6 +146,29 @@
if(mail == 0) { mail = ''; $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
$('#mail-update-li').html(mail);
+
+ var allevents = $(data).find('all-events').text();
+ if(allevents == 0) { allevents = ''; $('#allevents-update').removeClass('show') } else { $('#allevents-update').addClass('show') }
+ $('#allevents-update').html(allevents);
+
+ var alleventstoday = $(data).find('all-events-today').text();
+ if(alleventstoday == 0) { $('#allevents-update').removeClass('notif-allevents-today') } else { $('#allevents-update').addClass('notif-allevents-today') }
+
+ var events = $(data).find('events').text();
+ if(events == 0) { events = ''; $('#events-update').removeClass('show') } else { $('#events-update').addClass('show') }
+ $('#events-update').html(events);
+
+ var eventstoday = $(data).find('events-today').text();
+ if(eventstoday == 0) { $('#events-update').removeClass('notif-events-today') } else { $('#events-update').addClass('notif-events-today') }
+
+ var birthdays = $(data).find('birthdays').text();
+ if(birthdays == 0) {birthdays = ''; $('#birthdays-update').removeClass('show') } else { $('#birthdays-update').addClass('show') }
+ $('#birthdays-update').html(birthdays);
+
+ var birthdaystoday = $(data).find('birthdays-today').text();
+ if(birthdaystoday == 0) { $('#birthdays-update').removeClass('notif-birthdays-today') } else { $('#birthdays-update').addClass('notif-birthdays-today') }
+
+
var eNotif = $(data).find('notif')
if (eNotif.children("note").length==0){
@@ -151,7 +183,17 @@
html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen'));
nnm.append(html);
});
+
+ $("img[data-src]", nnm).each(function(i, el){
+ // Add src attribute for images with a data-src attribute
+ // However, don't bother if the data-src attribute is empty, because
+ // an empty "src" tag for an image will cause some browsers
+ // to prefetch the root page of the Friendica hub, which will
+ // unnecessarily load an entire profile/ or network/ page
+ if($(el).data("src") != '') $(el).attr('src', $(el).data("src"));
+ });
}
+
notif = eNotif.attr('count');
if (notif>0){
$("#nav-notifications-linkmenu").addClass("on");
@@ -172,8 +214,7 @@
});
});
-
-
+
NavUpdate();
// Allow folks to stop the ajax page updates with the pause/break key
$(document).keydown(function(event) {
@@ -207,7 +248,8 @@
function NavUpdate() {
if(! stopped) {
- $.get("ping",function(data) {
+ var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : '');
+ $.get(pingCmd,function(data) {
$(data).find('result').each(function() {
// send nav-update event
$('nav').trigger('nav-update', this);
@@ -219,12 +261,13 @@
if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
if($('#live-community').length) { src = 'community'; liveUpdate(); }
if($('#live-notes').length) { src = 'notes'; liveUpdate(); }
- if($('#live-display').length) {
+ if($('#live-display').length) { src = 'display'; liveUpdate(); }
+/* if($('#live-display').length) {
if(liking) {
liking = 0;
window.location.href=window.location.href
}
- }
+ }*/
if($('#live-photos').length) {
if(liking) {
liking = 0;
@@ -256,11 +299,16 @@
prev = 'live-' + src;
in_progress = true;
+
+ if ($(document).scrollTop() == 0)
+ force_update = true;
+
var udargs = ((netargs.length) ? '/' + netargs : '');
- var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
+ var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&force=' + ((force_update) ? 1 : 0);
$.get(update_url,function(data) {
in_progress = false;
+ force_update = false;
// $('.collapsed-comments',data).each(function() {
// var ident = $(this).attr('id');
// var is_hidden = $('#' + ident).is(':hidden');
@@ -272,8 +320,7 @@
//});
// add a new thread
-
- $('.tread-wrapper',data).each(function() {
+ $('.toplevel_item',data).each(function() {
var ident = $(this).attr('id');
if($('#' + ident).length == 0 && profile_page == 1) {
@@ -283,10 +330,26 @@
$('#' + prev).after($(this));
}
else {
+ // Find out if the hidden comments are open, so we can keep it that way
+ // if a new comment has been posted
+ var id = $('.hide-comments-total', this).attr('id');
+ if(typeof id != 'undefined') {
+ id = id.split('-')[3];
+ var commentsOpen = $("#collapsed-comments-" + id).is(":visible");
+ }
+
$('img',this).each(function() {
$(this).attr('src',$(this).attr('dst'));
});
+ //vScroll = $(document).scrollTop();
+ $('html').height($('html').height());
$('#' + ident).replaceWith($(this));
+
+ if(typeof id != 'undefined') {
+ if(commentsOpen) showHideComments(id);
+ }
+ $('html').height('auto');
+ //$(document).scrollTop(vScroll);
}
prev = ident;
});
@@ -325,6 +388,9 @@
}
/* autocomplete @nicknames */
$(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl");
+
+ // setup videos, since VideoJS won't take care of any loaded via AJAX
+ if(typeof videojs != 'undefined') videojs.autoSetup();
});
}
@@ -349,12 +415,19 @@
function dolike(ident,verb) {
unpause();
$('#like-rotator-' + ident.toString()).show();
- $.get('like/' + ident.toString() + '?verb=' + verb );
- if(timer) clearTimeout(timer);
- timer = setTimeout(NavUpdate,3000);
+ $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
liking = 1;
+ force_update = true;
}
+ function dosubthread(ident) {
+ unpause();
+ $('#like-rotator-' + ident.toString()).show();
+ $.get('subthread/' + ident.toString(), NavUpdate );
+ liking = 1;
+ }
+
+
function dostar(ident) {
ident = ident.toString();
$('#like-rotator-' + ident).show();
@@ -365,13 +438,33 @@
$('#star-' + ident).addClass('hidden');
$('#unstar-' + ident).removeClass('hidden');
}
- else {
+ else {
$('#starred-' + ident).addClass('unstarred');
$('#starred-' + ident).removeClass('starred');
$('#star-' + ident).removeClass('hidden');
$('#unstar-' + ident).addClass('hidden');
}
- $('#like-rotator-' + ident).hide();
+ $('#like-rotator-' + ident).hide();
+ });
+ }
+
+ function doignore(ident) {
+ ident = ident.toString();
+ $('#like-rotator-' + ident).show();
+ $.get('ignored/' + ident, function(data) {
+ if(data.match(/1/)) {
+ $('#ignored-' + ident).addClass('ignored');
+ $('#ignored-' + ident).removeClass('unignored');
+ $('#ignore-' + ident).addClass('hidden');
+ $('#unignore-' + ident).removeClass('hidden');
+ }
+ else {
+ $('#ignored-' + ident).addClass('unignored');
+ $('#ignored-' + ident).removeClass('ignored');
+ $('#ignore-' + ident).removeClass('hidden');
+ $('#unignore-' + ident).addClass('hidden');
+ }
+ $('#like-rotator-' + ident).hide();
});
}
@@ -436,6 +529,7 @@
commentClose(tarea,id);
if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,10);
+ force_update = true;
}
if(data.reload) {
window.location.href=data.reload;
@@ -467,6 +561,19 @@
+ function showHideComments(id) {
+ if( $("#collapsed-comments-" + id).is(":visible")) {
+ $("#collapsed-comments-" + id).hide();
+ $("#hide-comments-" + id).html(window.showMore);
+ }
+ else {
+ $("#collapsed-comments-" + id).show();
+ $("#hide-comments-" + id).html(window.showFewer);
+ }
+ }
+
+
+
function preview_post() {
$("#jot-preview").val("1");
$("#jot-preview-content").show();
@@ -555,6 +662,7 @@ function notifyMarkAll() {
$.get('notify/mark/all', function(data) {
if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,1000);
+ force_update = true;
});
}
@@ -595,13 +703,14 @@ function setupFieldRichtext(){
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "center",
theme_advanced_blockformats : "blockquote,code",
+ theme_advanced_resizing : 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 : '',
+ //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,
@@ -633,7 +742,7 @@ Array.prototype.remove = function(item) {
function previewTheme(elm) {
theme = $(elm).val();
$.getJSON('pretheme?f=&theme=' + theme,function(data) {
- $('#theme-preview').html('' + data.desc + '
');
+ $('#theme-preview').html('' + data.desc + '
' + data.version + '
' + data.credits + '
');
});
}