Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into v3

Browse Source
This commit is contained in:
Nicolas Stepien 2012-09-13 15:40:59 +02:00
commit f769714eeb
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
4chan_x.user.js
View File

@ -1487,7 +1487,7 @@
return Get.insert(post, root, context); return Get.insert(post, root, context);
}, },
archivedPost: function(req, board, postID, root, context) { archivedPost: function(req, board, postID, root, context) {
var bq, comment, data, o, post, thread, threadID; var bq, comment, data, o, post, thread, threadID, _ref;
if (post = g.posts["" + board + "." + postID]) { if (post = g.posts["" + board + "." + postID]) {
Get.insert(post, root, context); Get.insert(post, root, context);
return; return;
@ -1554,19 +1554,19 @@
dateUTC: data.timestamp, dateUTC: data.timestamp,
comment: comment comment: comment
}; };
if (data.media_filename) { if ((_ref = data.media) != null ? _ref.media_filename : void 0) {
o.file = { o.file = {
name: data.media_filename_processed, name: data.media.media_filename_processed,
timestamp: data.media_orig, timestamp: data.media.media_orig,
url: data.media_link || data.remote_media_link, url: data.media.media_link || data.media.remote_media_link,
height: data.media_h, height: data.media.media_h,
width: data.media_w, width: data.media.media_w,
MD5: data.media_hash, MD5: data.media.media_hash,
size: data.media_size, size: data.media.media_size,
turl: data.thumb_link || ("//thumbs.4chan.org/" + board + "/thumb/" + data.preview_orig), turl: data.media.thumb_link || ("//thumbs.4chan.org/" + board + "/thumb/" + data.media.preview_orig),
theight: data.preview_h, theight: data.media.preview_h,
twidth: data.preview_w, twidth: data.media.preview_w,
isSpoiler: data.spoiler === '1' isSpoiler: data.media.spoiler === '1'
}; };
} }
board = g.boards[board] || new Board(board); board = g.boards[board] || new Board(board);

24
script.coffee
View File

@ -1484,19 +1484,19 @@ Get =
dateUTC: data.timestamp dateUTC: data.timestamp
comment: comment comment: comment
# file # file
if data.media_filename if data.media?.media_filename
o.file = o.file =
name: data.media_filename_processed name: data.media.media_filename_processed
timestamp: data.media_orig timestamp: data.media.media_orig
url: data.media_link or data.remote_media_link url: data.media.media_link or data.media.remote_media_link
height: data.media_h height: data.media.media_h
width: data.media_w width: data.media.media_w
MD5: data.media_hash MD5: data.media.media_hash
size: data.media_size size: data.media.media_size
turl: data.thumb_link or "//thumbs.4chan.org/#{board}/thumb/#{data.preview_orig}" turl: data.media.thumb_link or "//thumbs.4chan.org/#{board}/thumb/#{data.media.preview_orig}"
theight: data.preview_h theight: data.media.preview_h
twidth: data.preview_w twidth: data.media.preview_w
isSpoiler: data.spoiler is '1' isSpoiler: data.media.spoiler is '1'
board = g.boards[board] or board = g.boards[board] or
new Board board new Board board