wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert !18 and fix bug that didn't expand videos

Browse Source
This commit is contained in:
Hannes Mannerheim 2016-02-16 12:21:06 +01:00
parent 2dbcda40b1
commit de078b42b5
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/dom-functions.js
View File

@ -1197,15 +1197,15 @@ function expand_queet(q,doScrolling) {
}
// show certain attachments in expanded content
if(q.children('script.attachment-json').length > 0
&& q.children('script.attachment-json').text() != 'undefined') {
if(q.children('.queet').children('script.attachment-json').length > 0
&& q.children('.queet').children('script.attachment-json').text() != 'undefined') {
try {
var attachmentsParsed = JSON.parse(q.children('script.attachment-json').text());
var attachmentsParsed = JSON.parse(q.children('.queet').children('script.attachment-json').text());
}
catch(e) {
var attachmentsParsed = false;
console.log('could not parse attachment json when expanding the notice: ' + e);
console.log("attachment-json: " + q.children('script.attachment-json').text());
console.log("attachment-json: " + q.children('.queet').children('script.attachment-json').text());
}
if(attachmentsParsed !== false) {
@ -1220,15 +1220,12 @@ function expand_queet(q,doScrolling) {
// attachments in the content link to /attachment/etc url and not direct to image/video, link is in title
if(typeof attachment_title != 'undefined') {
// hack to make remote webm-movies load
if(attachment_title_extension == 'webm') {
attachment_mimetype = 'video/webm';
}
// videos
if($.inArray(attachment_mimetype, ['video/mp4', 'video/ogg', 'video/quicktime', 'video/webm']) >=0) {
if(q.children('.queet').find('.expanded-content').children('.media').children('video').children('source[href="' + attachment_title + '"]').length < 1) { // not if already showed
console.log('video!');
// local attachment with a thumbnail
var attachment_poster = '';
if(typeof this.thumb_url != 'undefined') {
@ -2354,8 +2351,7 @@ function buildAttachmentHTML(attachments){
// if there's a local thumb_url we assume this is a image or video
else if(typeof this.thumb_url != 'undefined'
&& this.thumb_url !== null
&& isLocalURL(this.thumb_url)
&& !($.inArray(this.mimetype, ['video/mp4', 'video/ogg', 'video/quicktime', 'video/webm']) >=0)) {
&& isLocalURL(this.thumb_url)) {
var bigThumbW = 1000;
var bigThumbH = 3000;
if(bigThumbW > window.siteMaxThumbnailSize) {
@ -2423,15 +2419,6 @@ function buildAttachmentHTML(attachments){
urlsToHide.push(urlToHide); // hide this attachment url from the queet text
attachmentNum++;
}
else if ($.inArray(this.mimetype, ['video/mp4', 'video/ogg', 'video/quicktime', 'video/webm']) >=0) {
var posterAttribute = '';
if(typeof this.thumb_url != 'undefined'
&& this.thumb_url !== null
&& isLocalURL(this.thumb_url)) {
posterAttribute = 'poster="' + this.thumb_url + '"';
}
attachmentHTML += '<div class="media"><video class="attachment-video" controls data-width="' + this.width + '" data-height="' + this.height + '" ' + posterAttribute + '><source src="' + this.url + '" type="' + this.mimetype + '" /></video></div>';
}
});
}
return { html: '<div class="oembed-data oembed-num-' + oembedNum + '">' + oembedHTML + '</div><div class="queet-thumbs thumb-num-' + attachmentNum + '">' + attachmentHTML + '</div>',