aboutsummaryrefslogtreecommitdiffstats
path: root/view/js/main.js
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-07-20 05:38:19 -0400
committerAndrew Manning <tamanning@zoho.com>2016-07-20 05:38:19 -0400
commit99f7dd0fd42b4e29715c86062691877653a8b022 (patch)
treed6bf1cdad168d21947e4b5971c5bdfcc6cf99cca /view/js/main.js
parent0c7ad924a846eef183ca442be837b69a6014075a (diff)
parent9421e42dad0bee6e0aa292d390cf249e1d7f7df4 (diff)
downloadvolse-hubzilla-99f7dd0fd42b4e29715c86062691877653a8b022.tar.gz
volse-hubzilla-99f7dd0fd42b4e29715c86062691877653a8b022.tar.bz2
volse-hubzilla-99f7dd0fd42b4e29715c86062691877653a8b022.zip
Merge remote-tracking branch 'upstream/dev' into website-import
Diffstat (limited to 'view/js/main.js')
-rw-r--r--view/js/main.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/view/js/main.js b/view/js/main.js
index 8280d2ddb..a288f98f5 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -640,7 +640,7 @@ function updateConvItems(mode,data) {
var bimgcount = bimgs.length;
if (bimgcount) {
- bimgs.load(function() {
+ bimgs.on('load',function() {
bimgcount--;
if (! bimgcount) {
collapseHeight();