Merge branch 'FreshRSS/dev' into PostgreSQL

2 files changed, 41 insertions, 7 deletions

diff --git a/p/scripts/jquery.sticky-kit.min.js b/p/scripts/jquery.sticky-kit.min.js
new file mode 100644
index 000000000..e2a3c6de9
--- /dev/null
+++ b/p/scripts/jquery.sticky-kit.min.js
@@ -0,0 +1,9 @@
+/*
+ Sticky-kit v1.1.2 | WTFPL | Leaf Corcoran 2015 | http://leafo.net
+*/
+(function(){var b,f;b=this.jQuery||window.jQuery;f=b(window);b.fn.stick_in_parent=function(d){var A,w,J,n,B,K,p,q,k,E,t;null==d&&(d={});t=d.sticky_class;B=d.inner_scrolling;E=d.recalc_every;k=d.parent;q=d.offset_top;p=d.spacer;w=d.bottoming;null==q&&(q=0);null==k&&(k=void 0);null==B&&(B=!0);null==t&&(t="is_stuck");A=b(document);null==w&&(w=!0);J=function(a,d,n,C,F,u,r,G){var v,H,m,D,I,c,g,x,y,z,h,l;if(!a.data("sticky_kit")){a.data("sticky_kit",!0);I=A.height();g=a.parent();null!=k&&(g=g.closest(k));
+if(!g.length)throw"failed to find stick parent";v=m=!1;(h=null!=p?p&&a.closest(p):b("<div />"))&&h.css("position",a.css("position"));x=function(){var c,f,e;if(!G&&(I=A.height(),c=parseInt(g.css("border-top-width"),10),f=parseInt(g.css("padding-top"),10),d=parseInt(g.css("padding-bottom"),10),n=g.offset().top+c+f,C=g.height(),m&&(v=m=!1,null==p&&(a.insertAfter(h),h.detach()),a.css({position:"",top:"",width:"",bottom:""}).removeClass(t),e=!0),F=a.offset().top-(parseInt(a.css("margin-top"),10)||0)-q,
+u=a.outerHeight(!0),r=a.css("float"),h&&h.css({width:a.outerWidth(!0),height:u,display:a.css("display"),"vertical-align":a.css("vertical-align"),"float":r}),e))return l()};x();if(u!==C)return D=void 0,c=q,z=E,l=function(){var b,l,e,k;if(!G&&(e=!1,null!=z&&(--z,0>=z&&(z=E,x(),e=!0)),e||A.height()===I||x(),e=f.scrollTop(),null!=D&&(l=e-D),D=e,m?(w&&(k=e+u+c>C+n,v&&!k&&(v=!1,a.css({position:"fixed",bottom:"",top:c}).trigger("sticky_kit:unbottom"))),e<F&&(m=!1,c=q,null==p&&("left"!==r&&"right"!==r||a.insertAfter(h),
+h.detach()),b={position:"",width:"",top:""},a.css(b).removeClass(t).trigger("sticky_kit:unstick")),B&&(b=f.height(),u+q>b&&!v&&(c-=l,c=Math.max(b-u,c),c=Math.min(q,c),m&&a.css({top:c+"px"})))):e>F&&(m=!0,b={position:"fixed",top:c},b.width="border-box"===a.css("box-sizing")?a.outerWidth()+"px":a.width()+"px",a.css(b).addClass(t),null==p&&(a.after(h),"left"!==r&&"right"!==r||h.append(a)),a.trigger("sticky_kit:stick")),m&&w&&(null==k&&(k=e+u+c>C+n),!v&&k)))return v=!0,"static"===g.css("position")&&g.css({position:"relative"}),
+a.css({position:"absolute",bottom:d,top:"auto"}).trigger("sticky_kit:bottom")},y=function(){x();return l()},H=function(){G=!0;f.off("touchmove",l);f.off("scroll",l);f.off("resize",y);b(document.body).off("sticky_kit:recalc",y);a.off("sticky_kit:detach",H);a.removeData("sticky_kit");a.css({position:"",bottom:"",top:"",width:""});g.position("position","");if(m)return null==p&&("left"!==r&&"right"!==r||a.insertAfter(h),h.remove()),a.removeClass(t)},f.on("touchmove",l),f.on("scroll",l),f.on("resize",
+y),b(document.body).on("sticky_kit:recalc",y),a.on("sticky_kit:detach",H),setTimeout(l,0)}};n=0;for(K=this.length;n<K;n++)d=this[n],J(b(d));return this}}).call(this);
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 89edc54e5..8980fe2f6 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -493,6 +493,27 @@ function init_posts() {
 	}
 }
 
+function inject_script(name) {
+	var script = document.createElement('script');
+	script.async = 'async';
+	script.defer = 'defer';
+	script.src = '../scripts/' + name;
+	document.head.appendChild(script);
+}
+
+function init_sticky_column() {
+	if (!window.$ || !window.$.fn.stick_in_parent) {
+		if (window.console) {
+			console.log('FreshRSS waiting for Sticky-kit…');
+		}
+		window.setTimeout(init_sticky_column, 200);
+		return;
+	}
+	if ($('.toggle_aside').css('display') === 'none') {
+		$('#aside_feed .tree').stick_in_parent({parent:'#aside_feed'});
+	}
+}
+
 function init_column_categories() {
 	if (context.current_view !== 'normal') {
 		return;
@@ -508,7 +529,7 @@ function init_column_categories() {
 				this.alt = '▽';
 			}
 		});
-		$(this).parent().next(".tree-folder-items").slideToggle();
+		$(this).parent().next(".tree-folder-items").slideToggle(300 , function() { $(document.body).trigger("sticky_kit:recalc"); });
 		return false;
 	});
 	$('#aside_feed').on('click', '.tree-folder-items .item .dropdown-toggle', function () {
@@ -519,6 +540,8 @@ function init_column_categories() {
 			$(this).attr('href', '#dropdown-' + feed_id).prev('.dropdown-target').attr('id', 'dropdown-' + feed_id).parent().append(template);
 		}
 	});
+
+	init_sticky_column();
 }
 
 function init_shortcuts() {
@@ -526,7 +549,7 @@ function init_shortcuts() {
 		if (window.console) {
 			console.log('FreshRSS waiting for sortcut.js…');
 		}
-		window.setTimeout(init_shortcuts, 50);
+		window.setTimeout(init_shortcuts, 200);
 		return;
 	}
 	// Touches de manipulation
@@ -970,12 +993,12 @@ function load_more_posts() {
 		box_load_more.children('.flux:last').after($('#stream', data).children('.flux, .day'));
 		$('.pagination').replaceWith($('.pagination', data));
 		if (context.display_order === 'ASC') {
-			$('#nav_menu_read_all > .read_all').attr(
+			$('#nav_menu_read_all .read_all').attr(
 				'formaction', $('#bigMarkAsRead').attr('formaction')
 			);
 		} else {
 			$('#bigMarkAsRead').attr(
-				'formaction', $('#nav_menu_read_all > .read_all').attr('formaction')
+				'formaction', $('#nav_menu_read_all .read_all').attr('formaction')
 			);
 		}
 
@@ -990,6 +1013,7 @@ function load_more_posts() {
 
 		$('#load_more').removeClass('loading');
 		load_more = false;
+		$(document.body).trigger('sticky_kit:recalc');
 	});
 }
 
@@ -1310,7 +1334,7 @@ function init_normal() {
 		if (window.console) {
 			console.log('FreshRSS waiting for content…');
 		}
-		window.setTimeout(init_normal, 50);
+		window.setTimeout(init_normal, 100);
 		return;
 	}
 	init_column_categories();
@@ -1325,11 +1349,12 @@ function init_beforeDOM() {
 		if (window.console) {
 			console.log('FreshRSS waiting for jQuery…');
 		}
-		window.setTimeout(init_beforeDOM, 50);
+		window.setTimeout(init_beforeDOM, 100);
 		return;
 	}
 	init_confirm_action();
 	if (['normal', 'reader', 'global'].indexOf(context.current_view) >= 0) {
+		inject_script('jquery.sticky-kit.min.js');
 		init_normal();
 	}
 }
@@ -1339,7 +1364,7 @@ function init_afterDOM() {
 		if (window.console) {
 			console.log('FreshRSS waiting again for jQuery…');
 		}
-		window.setTimeout(init_afterDOM, 50);
+		window.setTimeout(init_afterDOM, 100);
 		return;
 	}
 	init_notifications();