diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2014-09-25 08:44:07 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2014-09-25 08:44:07 +0200 |
| commit | 6324a07dd8b17db5da0ce66c99fb69e2f3ec49e1 (patch) | |
| tree | 89e81409add34df97f633515181790d6aed4c726 /view/js/main.js | |
| parent | 7da97c198182f8f6f4286e16d80de205431d81bb (diff) | |
| parent | 92c723d37cd8ded2183d3334eb51e740170e191b (diff) | |
| download | volse-hubzilla-6324a07dd8b17db5da0ce66c99fb69e2f3ec49e1.tar.gz volse-hubzilla-6324a07dd8b17db5da0ce66c99fb69e2f3ec49e1.tar.bz2 volse-hubzilla-6324a07dd8b17db5da0ce66c99fb69e2f3ec49e1.zip | |
Rebase from upstream
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/view/js/main.js b/view/js/main.js index 2e297c9d6..f3b252171 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -113,7 +113,7 @@ } function viewsrc(id) { - $.colorbox({href: 'viewsrc/' + id }); + $.colorbox({href: 'viewsrc/' + id, maxWidth: '80%', maxHeight: '80%' }); } function qCommentInsert(obj,id) { @@ -704,22 +704,26 @@ function updateConvItems(mode,data) { } - function justifyPhotos(bParam_page) { + function justifyPhotos() { justifiedGalleryActive = true; - $('#photo-album-contents-' + bParam_page).justifiedGallery({ - lastRow : 'nojustify', + $('#photo-album-contents').justifiedGallery({ margins: 3, - sizeRangeSuffixes : { + sizeRangeSuffixes: { 'lt100': '-2', 'lt240': '-2', 'lt320': '-2', - 'lt500': '-1', + 'lt500': '', 'lt640': '-1', 'lt1024': '-0' } }).on('jg.complete', function(e){ justifiedGalleryActive = false; }); } + function justifyPhotosAjax() { + justifiedGalleryActive = true; + $('#photo-album-contents').justifiedGallery('norewind').on('jg.complete', function(e){ justifiedGalleryActive = false; }); + } + function notify_popup_loader(notifyType) { /* notifications template */ @@ -739,7 +743,7 @@ function updateConvItems(mode,data) { if(data.notify.length==0){ - $("#nav-" + notifyType + "-menu").html(notifications_empty); + $("#nav-" + notifyType + "-menu").html(aStr[nothingnew]); } else { $("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark); |