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

Include protocol in URLs.

Browse Source
This commit is contained in:
ccd0 2015-04-13 00:25:08 -07:00
parent 282ee1fb3f
commit 20a31c2ba5
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/General/Build.coffee
View File

@ -56,15 +56,15 @@ Build =
o.file =
name: (Build.unescape data.filename) + data.ext
url: if boardID is 'f'
"//i.4cdn.org/#{boardID}/#{encodeURIComponent data.filename}#{data.ext}"
"#{location.protocol}//i.4cdn.org/#{boardID}/#{encodeURIComponent data.filename}#{data.ext}"
else
"//i.4cdn.org/#{boardID}/#{data.tim}#{data.ext}"
"#{location.protocol}//i.4cdn.org/#{boardID}/#{data.tim}#{data.ext}"
height: data.h
width: data.w
MD5: data.md5
size: $.bytesToString data.fsize
sizeInBytes: data.fsize
turl: "//i.4cdn.org/#{boardID}/#{data.tim}s.jpg"
turl: "#{location.protocol}//i.4cdn.org/#{boardID}/#{data.tim}s.jpg"
theight: data.tn_h
twidth: data.tn_w
isSpoiler: !!data.spoiler
@ -108,9 +108,11 @@ Build =
### File Info ###
if file
protocol = /^https?:(?=\/\/i\.4cdn\.org\/)/
fileURL = file.url.replace protocol, ''
shortFilename = Build.shortFilename file.name
fileDims = if file.url[-4..] is '.pdf' then 'PDF' else "#{file.width}x#{file.height}"
fileThumb = if file.isSpoiler then Build.spoilerThumb boardID else file.turl
fileThumb = if file.isSpoiler then Build.spoilerThumb(boardID) else file.turl.replace(protocol, '')
fileBlock = <%= importHTML('Build/File') %>

6
src/General/html/Build/File.html
View File

@ -3,18 +3,18 @@
?{boardID === "f"}{
<div class="fileInfo"><span class="fileText" id="fT${postID}">
File:
<a data-width="${file.width}" data-height="${file.height}" href="${file.url}" target="_blank">${file.name}</a>
<a data-width="${file.width}" data-height="${file.height}" href="${fileURL}" target="_blank">${file.name}</a>
-(${file.size}, ${fileDims}, ${file.tag})
</span></div>
}{
<div class="fileText" id="fT${postID}"?{file.isSpoiler}{ title="${file.name}"}>
File:
<a?{file.name === shortFilename || file.isSpoiler}{}{ title="${file.name}"} href="${file.url}" target="_blank">
<a?{file.name === shortFilename || file.isSpoiler}{}{ title="${file.name}"} href="${fileURL}" target="_blank">
?{file.isSpoiler}{Spoiler Image}{${shortFilename}}
</a>
(${file.size}, ${fileDims})
</div>
<a class="fileThumb?{file.isSpoiler}{ imgspoiler}{}" href="${file.url}" target="_blank">
<a class="fileThumb?{file.isSpoiler}{ imgspoiler}{}" href="${fileURL}" target="_blank">
<img
?{suppressThumb}{ data-src="${fileThumb}"}{ src="${fileThumb}"}
alt="${file.size}"

4
src/General/lib/fetcher.class
View File

@ -150,13 +150,13 @@ class Fetcher
o.file =
name: data.media.media_filename
url: data.media.media_link or data.media.remote_media_link or
"//i.4cdn.org/#{@boardID}/#{encodeURIComponent data.media[if @boardID is 'f' then 'media_filename' else 'media_orig']}"
"#{location.protocol}//i.4cdn.org/#{@boardID}/#{encodeURIComponent data.media[if @boardID is 'f' then 'media_filename' else 'media_orig']}"
height: data.media.media_h
width: data.media.media_w
MD5: data.media.media_hash
size: $.bytesToString data.media.media_size
sizeInBytes: data.media.media_size
turl: data.media.thumb_link or "//i.4cdn.org/#{@boardID}/#{data.media.preview_orig}"
turl: data.media.thumb_link or "#{location.protocol}//i.4cdn.org/#{@boardID}/#{data.media.preview_orig}"
theight: data.media.preview_h
twidth: data.media.preview_w
isSpoiler: data.media.spoiler is '1'