X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js%2Fmain.js;h=23f63f8224616274d08e5c61c45e0d4dae5eb39d;hb=d0ddf00efea897ab703af1bbdcb7cd5cd0cf6610;hp=7ad2b7e648f37e71ba20e6c751a448ddc8548fa9;hpb=5d30008ab3d09a8e3be5b7dbc8bd46aa017aab8b;p=friendica.git

diff --git a/js/main.js b/js/main.js
index 7ad2b7e648..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);
@@ -82,19 +80,23 @@
  		}
  		}
 		$('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;
 		});
@@ -103,10 +105,6 @@
 		});
 		
 		// fancyboxes
-		/*$("a.popupbox").fancybox({
-			'transitionIn' : 'elastic',
-			'transitionOut' : 'elastic'
-		});*/
 		$("a.popupbox").colorbox({
 			'inline' : true,
 			'transition' : 'elastic'
@@ -301,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');
@@ -387,7 +390,7 @@
 			$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
 
 			// setup videos, since VideoJS won't take care of any loaded via AJAX
-			if(typeof _V_ != 'undefined') _V_.autoSetup();
+			if(typeof videojs != 'undefined') videojs.autoSetup();
 		});
 	}
 
@@ -414,6 +417,7 @@
 		$('#like-rotator-' + ident.toString()).show();
 		$.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
 		liking = 1;
+		force_update = true;
 	}
 
 	function dosubthread(ident) {
@@ -434,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();
 		});
 	}
 
@@ -505,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;
@@ -637,6 +662,7 @@ function notifyMarkAll() {
 	$.get('notify/mark/all', function(data) {
 		if(timer) clearTimeout(timer);
 		timer = setTimeout(NavUpdate,1000);
+		force_update = true;
 	});
 }
 
@@ -677,6 +703,7 @@ 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,