X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js%2Fmain.js;h=c20455ad14bd24f19cea4955168bd4b1b466becf;hb=77e77027b40c5fc07b249d2b294148312852c673;hp=8421deb567d907b8100a2ff000b214292c53b9cc;hpb=84fd2a1501e3cf2e7bf3c140e7f91ecfca2f7c7f;p=friendica.git

diff --git a/js/main.js b/js/main.js
old mode 100644
new mode 100755
index 8421deb567..c20455ad14
--- a/js/main.js
+++ b/js/main.js
@@ -88,6 +88,8 @@
 
 		/* notifications template */
 		var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
+		var notifications_all = unescape($('<div>').append( $("#nav-notifications-see-all").clone() ).html()); //outerHtml hack
+		var notifications_mark = unescape($('<div>').append( $("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack
 		var notifications_empty = unescape($("#nav-notifications-menu").html());
 		
 		/* nav update event  */
@@ -112,23 +114,23 @@
 
 			var eNotif = $(data).find('notif')
 			notif = eNotif.attr('count');
-			if (notif>0){
+			if (notif>=0){
 				$("#nav-notifications-linkmenu").addClass("on");
 				nnm = $("#nav-notifications-menu");
 				
-				nnm.html("<li><a href='"+baseurl+"/notifications/network'>Show All Notifications</a></li>");
+				nnm.html(notifications_all + notifications_mark);
 				
 				//nnm.attr('popup','true');
 				eNotif.children("note").each(function(){
 					e = $(this);
 					text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
-					html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'));
+					html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen'));
 					nnm.append(html);
 				});
 				
 			} else {
-				$("#nav-notifications-linkmenu").removeClass("on");
-				$("#nav-notifications-menu").html(notifications_empty);
+				//				$("#nav-notifications-linkmenu").removeClass("on");
+				//              $("#nav-notifications-menu").html(notifications_empty);
 			}
 			if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
 			$('#notify-update').html(notif);
@@ -241,23 +243,30 @@
 
 			$('.tread-wrapper',data).each(function() {
 				var ident = $(this).attr('id');
+
 				if($('#' + ident).length == 0 && profile_page == 1) {
 					$('img',this).each(function() {
 						$(this).attr('src',$(this).attr('dst'));
 					});
 					$('#' + prev).after($(this));
 				}
+				else {
+					$('img',this).each(function() {
+						$(this).attr('src',$(this).attr('dst'));
+					});
+					$('#' + ident).replaceWith($(this));
+				}
 				prev = ident;
 			});
 
 			// reset vars for inserting individual items
 
-			prev = 'live-' + src;
+			/*			prev = 'live-' + src;
 
-			$('.wall-item-outside-wrapper.comment',data).each(function() {
+			$('.wall-item-outside-wrapper',data).each(function() {
 				var ident = $(this).attr('id');
 
-				if($('#' + ident).length == 0) {
+				if($('#' + ident).length == 0 && prev != 'live-' + src) {
 						$('img',this).each(function() {
 							$(this).attr('src',$(this).attr('dst'));
 						});
@@ -276,14 +285,14 @@
 				}
 				prev = ident; 
 			});
-
+			*/
 			$('.like-rotator').hide();
 			if(commentBusy) {
 				commentBusy = false;
 				$('body').css('cursor', 'auto');
 			}
 			/* autocomplete @nicknames */
-			$(".comment-edit-wrapper  textarea").contact_autocomplete(baseurl+"/acl");
+			$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
 		});
 	}
 
@@ -382,6 +391,7 @@
 		unpause();
 		commentBusy = true;
 		$('body').css('cursor', 'wait');
+		$("#comment-preview-inp-" + id).val("0");
 		$.post(  
              "item",  
              $("#comment-edit-form-" + id).serialize(),
@@ -404,6 +414,47 @@
          return false;  
 	}
 
+
+	function preview_comment(id) {
+		$("#comment-preview-inp-" + id).val("1");
+		$("#comment-edit-preview-" + id).show();
+		$.post(  
+             "item",  
+             $("#comment-edit-form-" + id).serialize(),
+			function(data) {
+				if(data.preview) {
+						
+					$("#comment-edit-preview-" + id).html(data.preview);
+					$("#comment-edit-preview-" + id + " a").click(function() { return false; });
+				}
+			},
+			"json"  
+         );  
+         return true;  
+	}
+
+
+
+	function preview_post() {
+		$("#jot-preview").val("1");
+		$("#jot-preview-content").show();
+		tinyMCE.triggerSave();
+		$.post(  
+			"item",  
+			$("#profile-jot-form").serialize(),
+			function(data) {
+				if(data.preview) {			
+					$("#jot-preview-content").html(data.preview);
+					$("#jot-preview-content" + " a").click(function() { return false; });
+				}
+			},
+			"json"  
+		);  
+		$("#jot-preview").val("0");
+		return true;  
+	}
+
+
 	function unpause() {
 		// unpause auto reloads if they are currently stopped
 		totStopped = false;
@@ -468,6 +519,14 @@ function checkboxhighlight(box) {
   }
 }
 
+function notifyMarkAll() {
+	$.get('notify/mark/all', function(data) {
+		if(timer) clearTimeout(timer);
+		timer = setTimeout(NavUpdate,1000);
+	});
+}
+
+
 function setupFieldRichtext(){
 	tinyMCE.init({
 		theme : "advanced",