X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js%2Fmain.js;h=488d5d4c72d63d950ac9afab4a7a092fca0a2fc7;hb=cc210bae3de704eaaef608e9083452fb982fff4a;hp=7a90fa91063581a40057c3562837ec18fc6d154a;hpb=97715c73fcb5b6de582f7165f70526acaf24bc86;p=friendica.git
diff --git a/js/main.js b/js/main.js
index 7a90fa9106..488d5d4c72 100644
--- a/js/main.js
+++ b/js/main.js
@@ -17,6 +17,7 @@
}
+
var src = null;
var prev = null;
var livetime = null;
@@ -72,7 +73,16 @@
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){
+ close_last_popup_menu();
menu = $( $(this).attr('rel') );
e.preventDefault();
e.stopPropagation();
@@ -89,18 +99,17 @@
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({
+ /*$("a.popupbox").fancybox({
'transitionIn' : 'elastic',
'transitionOut' : 'elastic'
+ });*/
+ $("a.popupbox").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
@@ -112,6 +121,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);
@@ -136,6 +148,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){
@@ -150,7 +185,13 @@
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
+ $(el).attr('src', $(el).data("src"));
+ });
}
+
notif = eNotif.attr('count');
if (notif>0){
$("#nav-notifications-linkmenu").addClass("on");
@@ -171,8 +212,7 @@
});
});
-
-
+
NavUpdate();
// Allow folks to stop the ajax page updates with the pause/break key
$(document).keydown(function(event) {
@@ -206,7 +246,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);
@@ -218,12 +259,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;
@@ -271,8 +313,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) {
@@ -282,10 +323,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;
});
@@ -348,12 +405,18 @@
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;
+ }
+
+ 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();
@@ -466,6 +529,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();
@@ -558,12 +634,36 @@ 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",
+ plugins : "bbcode,paste, inlinepopups",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
@@ -574,12 +674,13 @@ function setupFieldRichtext(){
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,
+ file_browser_callback : "fcFileBrowser",
});
}
@@ -607,7 +708,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 + '
');
});
}