GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Updated 'more' anchor for attachments to do an XHR GET

Browse Source
This commit is contained in:
Sarven Capadisli 2010-03-18 00:19:32 +01:00
parent dc71833ce6
commit d8a533274f
6 changed files with 73 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
js/util.js
View File

@ -399,58 +399,70 @@ var SN = { // StatusNet
return; return;
} }
$.fn.jOverlay.options = { var attachment_more = notice.find('.attachment.more');
method : 'GET', if (attachment_more.length > 0) {
data : '', attachment_more.click(function() {
url : '', $.get($(this).attr('href')+'/ajax', null, function(data) {
color : '#000', notice.find('.entry-title .entry-content').html($(data).find('#attachment_view .entry-content').html());
opacity : '0.6', });
zIndex : 9999,
center : false,
imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif',
bgClickToClose : true,
success : function() {
$('#jOverlayContent').append('<button class="close">&#215;</button>');
$('#jOverlayContent button').click($.closeOverlay);
},
timeout : 0,
autoHide : true,
css : {'max-width':'542px', 'top':'5%', 'left':'32.5%'}
};
notice.find('a.attachment').click(function() {
var attachId = ($(this).attr('id').substring('attachment'.length + 1));
if (attachId) {
$().jOverlay({url: $('address .url')[0].href+'attachment/' + attachId + '/ajax'});
return false; return false;
} });
}); }
else {
if ($('#shownotice').length == 0) { $.fn.jOverlay.options = {
var t; method : 'GET',
notice.find('a.thumbnail').hover( data : '',
function() { url : '',
var anchor = $(this); color : '#000',
$('a.thumbnail').children('img').hide(); opacity : '0.6',
anchor.closest(".entry-title").addClass('ov'); zIndex : 9999,
center : false,
if (anchor.children('img').length === 0) { imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif',
t = setTimeout(function() { bgClickToClose : true,
$.get($('address .url')[0].href+'attachment/' + (anchor.attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) { success : function() {
anchor.append(data); $('#jOverlayContent').append('<button class="close">&#215;</button>');
}); $('#jOverlayContent button').click($.closeOverlay);
}, 500);
}
else {
anchor.children('img').show();
}
}, },
function() { timeout : 0,
clearTimeout(t); autoHide : true,
$('a.thumbnail').children('img').hide(); css : {'max-width':'542px', 'top':'5%', 'left':'32.5%'}
$(this).closest('.entry-title').removeClass('ov'); };
notice.find('a.attachment').click(function() {
var attachId = ($(this).attr('id').substring('attachment'.length + 1));
if (attachId) {
$().jOverlay({url: $('address .url')[0].href+'attachment/' + attachId + '/ajax'});
return false;
} }
); });
if ($('#shownotice').length == 0) {
var t;
notice.find('a.thumbnail').hover(
function() {
var anchor = $(this);
$('a.thumbnail').children('img').hide();
anchor.closest(".entry-title").addClass('ov');
if (anchor.children('img').length === 0) {
t = setTimeout(function() {
$.get($('address .url')[0].href+'attachment/' + (anchor.attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) {
anchor.append(data);
});
}, 500);
}
else {
anchor.children('img').show();
}
},
function() {
clearTimeout(t);
$('a.thumbnail').children('img').hide();
$(this).closest('.entry-title').removeClass('ov');
}
);
}
} }
}, },

2
lib/attachmentlist.php
View File

@ -368,9 +368,7 @@ class Attachment extends AttachmentListItem
{ {
$body = $this->scrubHtmlFile($attachment); $body = $this->scrubHtmlFile($attachment);
if ($body) { if ($body) {
$this->out->elementStart('div', array('class' => 'inline-attachment'));
$this->out->raw($body); $this->out->raw($body);
$this->out->elementEnd('div');
} }
} }

2
plugins/OStatus/classes/Ostatus_profile.php
View File

@ -559,7 +559,7 @@ class Ostatus_profile extends Memcached_DataObject
htmlspecialchars($attachUrl) . htmlspecialchars($attachUrl) .
'" class="attachment more">' . '" class="attachment more">' .
// TRANS: expansion link for too-long remote messages // TRANS: expansion link for too-long remote messages
htmlspecialchars(_m('(more)')) . htmlspecialchars(_m('more')) .
'</a>'; '</a>';
} }
} }

9
theme/base/css/display.css
View File

@ -1284,9 +1284,16 @@ height:16px;
position:relative; position:relative;
padding-left:16px; padding-left:16px;
} }
#attachments .attachment { #attachments .attachment,
.notice .attachment.more {
padding-left:0; padding-left:0;
} }
.notice .attachment.more:before {
content:'( ';
}
.notice .attachment.more:after {
content:' )';
}
.notice .attachment img { .notice .attachment img {
position:absolute; position:absolute;
top:18px; top:18px;

3
theme/default/css/display.css
View File

@ -410,7 +410,8 @@ background-position: 0 -1714px;
.notice .attachment { .notice .attachment {
background-position:0 -394px; background-position:0 -394px;
} }
#attachments .attachment { #attachments .attachment,
.notice .attachment.more {
background:none; background:none;
} }
.notice-options .notice_reply { .notice-options .notice_reply {

3
theme/identica/css/display.css
View File

@ -409,7 +409,8 @@ background-position: 0 -1714px;
.notice .attachment { .notice .attachment {
background-position:0 -394px; background-position:0 -394px;
} }
#attachments .attachment { #attachments .attachment,
.notice .attachment.more {
background:none; background:none;
} }
.notice-options .notice_reply { .notice-options .notice_reply {