Commit d8a53327 authored by Sarven Capadisli's avatar Sarven Capadisli

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

parent dc71833c
......@@ -399,58 +399,70 @@ var SN = { // StatusNet
return;
}
$.fn.jOverlay.options = {
method : 'GET',
data : '',
url : '',
color : '#000',
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;
}
});
var attachment_more = notice.find('.attachment.more');
if (attachment_more.length > 0) {
attachment_more.click(function() {
$.get($(this).attr('href')+'/ajax', null, function(data) {
notice.find('.entry-title .entry-content').html($(data).find('#attachment_view .entry-content').html());
});
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();
}
return false;
});
}
else {
$.fn.jOverlay.options = {
method : 'GET',
data : '',
url : '',
color : '#000',
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);
},
function() {
clearTimeout(t);
$('a.thumbnail').children('img').hide();
$(this).closest('.entry-title').removeClass('ov');
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;
}
);
});
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');
}
);
}
}
},
......
......@@ -368,9 +368,7 @@ class Attachment extends AttachmentListItem
{
$body = $this->scrubHtmlFile($attachment);
if ($body) {
$this->out->elementStart('div', array('class' => 'inline-attachment'));
$this->out->raw($body);
$this->out->elementEnd('div');
}
}
......
......@@ -559,7 +559,7 @@ class Ostatus_profile extends Memcached_DataObject
htmlspecialchars($attachUrl) .
'" class="attachment more">' .
// TRANS: expansion link for too-long remote messages
htmlspecialchars(_m('(more)')) .
htmlspecialchars(_m('more')) .
'</a>';
}
}
......
......@@ -1284,9 +1284,16 @@ height:16px;
position:relative;
padding-left:16px;
}
#attachments .attachment {
#attachments .attachment,
.notice .attachment.more {
padding-left:0;
}
.notice .attachment.more:before {
content:'( ';
}
.notice .attachment.more:after {
content:' )';
}
.notice .attachment img {
position:absolute;
top:18px;
......
......@@ -410,7 +410,8 @@ background-position: 0 -1714px;
.notice .attachment {
background-position:0 -394px;
}
#attachments .attachment {
#attachments .attachment,
.notice .attachment.more {
background:none;
}
.notice-options .notice_reply {
......
......@@ -409,7 +409,8 @@ background-position: 0 -1714px;
.notice .attachment {
background-position:0 -394px;
}
#attachments .attachment {
#attachments .attachment,
.notice .attachment.more {
background:none;
}
.notice-options .notice_reply {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment