From 95824642a643ccee269f7bf1a5ac570bc966a2e2 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Nov 2013 19:07:58 -0800 Subject: make font-asewome optional. Also include jquery.browser in js/main.js so we can turn off the migration toolkit. --- js/main.js | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'js/main.js') diff --git a/js/main.js b/js/main.js index f9dc95daa..e1769f77a 100644 --- a/js/main.js +++ b/js/main.js @@ -1203,3 +1203,42 @@ function zid(s) { s = s + achar + 'f=&zid=' + zid; return s; } + +// provide jquery.browser so we can get rid of the migration toolkit + +jQuery.uaMatch = function( ua ) { + ua = ua.toLowerCase(); + + var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) || + /(webkit)[ \/]([\w.]+)/.exec( ua ) || + /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) || + /(msie) ([\w.]+)/.exec( ua ) || + ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) || + []; + + return { + browser: match[ 1 ] || "", + version: match[ 2 ] || "0" + }; +}; + + +// Don't clobber any existing jQuery.browser in case it's different +if ( !jQuery.browser ) { + matched = jQuery.uaMatch( navigator.userAgent ); + browser = {}; + + if ( matched.browser ) { + browser[ matched.browser ] = true; + browser.version = matched.version; + } + + // Chrome is Webkit, but Webkit is also Safari. + if ( browser.chrome ) { + browser.webkit = true; + } else if ( browser.webkit ) { + browser.safari = true; + } + + jQuery.browser = browser; +} -- cgit v1.2.3 From ed71567e5ce3cc5c9dd30acc0c2bc527960fa3da Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 26 Nov 2013 13:24:36 -0800 Subject: create jquery-compat to hold deprecated jquery functions, load it before all the dependent js scripts --- js/main.js | 39 --------------------------------------- 1 file changed, 39 deletions(-) (limited to 'js/main.js') diff --git a/js/main.js b/js/main.js index e1769f77a..f9dc95daa 100644 --- a/js/main.js +++ b/js/main.js @@ -1203,42 +1203,3 @@ function zid(s) { s = s + achar + 'f=&zid=' + zid; return s; } - -// provide jquery.browser so we can get rid of the migration toolkit - -jQuery.uaMatch = function( ua ) { - ua = ua.toLowerCase(); - - var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) || - /(webkit)[ \/]([\w.]+)/.exec( ua ) || - /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) || - /(msie) ([\w.]+)/.exec( ua ) || - ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) || - []; - - return { - browser: match[ 1 ] || "", - version: match[ 2 ] || "0" - }; -}; - - -// Don't clobber any existing jQuery.browser in case it's different -if ( !jQuery.browser ) { - matched = jQuery.uaMatch( navigator.userAgent ); - browser = {}; - - if ( matched.browser ) { - browser[ matched.browser ] = true; - browser.version = matched.version; - } - - // Chrome is Webkit, but Webkit is also Safari. - if ( browser.chrome ) { - browser.webkit = true; - } else if ( browser.webkit ) { - browser.safari = true; - } - - jQuery.browser = browser; -} -- cgit v1.2.3 From f8e19271502035473197c8bf1b4cd267aa827851 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Dec 2013 13:43:15 -0800 Subject: this should fix the "always loads page 2 first if you're scrolled down the page a fair ways and reload the page". --- js/main.js | 53 +++++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) (limited to 'js/main.js') diff --git a/js/main.js b/js/main.js index f9dc95daa..ba36861b2 100644 --- a/js/main.js +++ b/js/main.js @@ -150,7 +150,7 @@ var scroll_next = false; var next_page = 1; var page_load = true; - var loadingPage = false; + var loadingPage = true; var pageHasMoreContent = true; var updateCountsOnly = false; @@ -511,6 +511,10 @@ function updateConvItems(mode,data) { } prev = ident; }); + + if(loadingPage) { + loadingPage = false; + } } $('.like-rotator').spin(false); @@ -984,35 +988,28 @@ function previewTheme(elm) { $(document).ready(function() { -jQuery.timeago.settings.strings = { - prefixAgo : aStr['t01'], - prefixFromNow : aStr['t02'], - suffixAgo : aStr['t03'], - suffixFromNow : aStr['t04'], - seconds : aStr['t05'], - minute : aStr['t06'], - minutes : aStr['t07'], - hour : aStr['t08'], - hours : aStr['t09'], - day : aStr['t10'], - days : aStr['t11'], - month : aStr['t12'], - months : aStr['t13'], - year : aStr['t14'], - years : aStr['t15'], - wordSeparator : aStr['t16'], - numbers : aStr['t17'], -}; - - -$(".autotime").timeago(); -//$("div.wall-item-body").divgrow({ initialHeight: 400 }); - -//reCalcHeight(); - - + jQuery.timeago.settings.strings = { + prefixAgo : aStr['t01'], + prefixFromNow : aStr['t02'], + suffixAgo : aStr['t03'], + suffixFromNow : aStr['t04'], + seconds : aStr['t05'], + minute : aStr['t06'], + minutes : aStr['t07'], + hour : aStr['t08'], + hours : aStr['t09'], + day : aStr['t10'], + days : aStr['t11'], + month : aStr['t12'], + months : aStr['t13'], + year : aStr['t14'], + years : aStr['t15'], + wordSeparator : aStr['t16'], + numbers : aStr['t17'], + }; + $(".autotime").timeago(); }); -- cgit v1.2.3 From 1bc7cac4f542c68e16f6159e26603555706d4121 Mon Sep 17 00:00:00 2001 From: zottel Date: Tue, 10 Dec 2013 09:14:27 +0100 Subject: When counting not yet loaded images, count all in .wall-item-body. --- js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/main.js') diff --git a/js/main.js b/js/main.js index ba36861b2..70d11bfd3 100644 --- a/js/main.js +++ b/js/main.js @@ -527,7 +527,7 @@ function updateConvItems(mode,data) { /* autocomplete @nicknames */ $(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl"); - var bimgs = $(".wall-item-body > img").not(function() { return this.complete; }); + var bimgs = $(".wall-item-body img").not(function() { return this.complete; }); var bimgcount = bimgs.length; if (bimgcount) { -- cgit v1.2.3