From caa148c1e3736b6d51327883b04405b00a4cda0b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 1 Sep 2013 19:15:08 -0700
Subject: Sheesh. Three lines of Javascript. All you have to do is find which
 of the three lines is doing something wrong. Or FILE A BUG. Or use a
 different browser (not *try* a different browser, *use* a different browser),
 or turn off freaking tinymce. But no - let's argue about browsers instead.

---
 js/fk.autocomplete.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'js')

diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js
index cd0a1c044..8bac41936 100644
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
@@ -32,6 +32,12 @@ function ACPopup(elm,backend_url){
 		}
 	}
 
+	if(! w)
+		w = 530;
+
+	if(! h)
+		h = 130;
+
 	style.top=style.top+h;
 	style.width = w;
 	style.position = 'absolute';
-- 
cgit v1.2.3


From 6519433301a571d8e12ffa24b56534bb2e3afe5f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 25 Sep 2013 21:22:36 -0700
Subject: suppress creating the directory update record for profile updates
 which are part of the normal import_xchan sequence - otherwise we get two for
 every change. Create it normally if we are called with a profile_update
 message and don't go through the whole import_xchan thing.

---
 js/main.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/main.js b/js/main.js
index 9d764c74e..cd5040064 100644
--- a/js/main.js
+++ b/js/main.js
@@ -119,6 +119,7 @@
 	var next_page = 1;
 	var page_load = true;
 	var loadingPage = false;
+	var pageHasMoreContent = true;
 
 	$(function() {
 		$.ajaxSetup({cache: false});
@@ -984,7 +985,7 @@ $(window).scroll(function () {
 		}
 	
 		if($(window).scrollTop() + $(window).height() == $(document).height()) {
-			if(! loadingPage) {
+			if((pageHasMoreContent) && (! loadingPage)) {
 				$('#more').hide();
 				$('#no-more').hide();
 				//			alert('scroll');
-- 
cgit v1.2.3


From 0e793dea9bfc21a7c1c369d1db727d7ff900c90a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 8 Oct 2013 21:17:11 -0700
Subject: replace a bunch of graphic icons with vector icons

---
 js/main.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'js')

diff --git a/js/main.js b/js/main.js
index cd5040064..0604b81fb 100644
--- a/js/main.js
+++ b/js/main.js
@@ -658,12 +658,16 @@ function updateConvItems(mode,data) {
 			if(data.result == 1) {
 				$('#starred-' + ident).addClass('starred');
 				$('#starred-' + ident).removeClass('unstarred');
+				$('#starred-' + ident).addClass('icon-star-full');
+				$('#starred-' + ident).removeClass('icon-star-empty');
 				$('#star-' + ident).addClass('hidden');
 				$('#unstar-' + ident).removeClass('hidden');
 			}
 			else {			
 				$('#starred-' + ident).addClass('unstarred');
 				$('#starred-' + ident).removeClass('starred');
+				$('#starred-' + ident).addClass('icon-star-empty');
+				$('#starred-' + ident).removeClass('icon-star-full');
 				$('#star-' + ident).removeClass('hidden');
 				$('#unstar-' + ident).addClass('hidden');
 			}
-- 
cgit v1.2.3


From 87f1c6b8ecaf796409c6dfeb8735ce0af2ba410c Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 9 Oct 2013 20:19:02 -0700
Subject: more icon conversions - savedsearch listings need more work. The drop
 icon should be hidden unless the entry is being hovered.

---
 js/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/main.js b/js/main.js
index 0604b81fb..d5260a4be 100644
--- a/js/main.js
+++ b/js/main.js
@@ -581,11 +581,11 @@ function updateConvItems(mode,data) {
 
 
 	function imgbright(node) {
-		$(node).removeClass("drophide").addClass("drop");
+//		$(node).removeClass("drophide").addClass("drop");
 	}
 
 	function imgdull(node) {
-		$(node).removeClass("drop").addClass("drophide");
+//		$(node).removeClass("drop").addClass("drophide");
 	}
 
 	function notify_popup_loader(notifyType) {
-- 
cgit v1.2.3