Skip to content

Commit

Permalink
Merge pull request popcorn-official#2984 from popcorn-official/develo…
Browse files Browse the repository at this point in the history
…pment
  • Loading branch information
kiriles90 authored Apr 17, 2024
2 parents 6d5f996 + ed54e81 commit e484724
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions dist/mac/casks/popcorn-time.rb
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
cask "popcorn-time" do
version "0.5.0"
version "0.5.1"

nwjs = "0.64.0"
nwjs = "0.86.0"
arch = "x64"

name token.gsub(/\b\w/, &:capitalize)
desc "BitTorrent client that includes an integrated media player"
homepage "https://github.com/popcorn-official/popcorn-desktop/releases/download/v0.5.0/Popcorn-Time-0.5.0-osx64.zip"
homepage "https://github.com/popcorn-official/popcorn-desktop/releases/download/v0.5.1/Popcorn-Time-0.5.1-osx64.zip"

repo = "popcorn-official/popcorn-desktop"
zip = "#{name.first}-#{version}-osx64.zip"
Expand All @@ -21,9 +21,9 @@
silent = "silent"
end

sha256 "26abc15d95b4afa48d9383f997ed7393bbcc0cca794a6aa8210b3dc468c08b89"
sha256 "119225ce4c8f3049358412e7230fba5a05c3af2b7168bf71acdc178d994c2f28"

url "https://github.com/popcorn-official/popcorn-desktop/releases/download/v0.5.0/Popcorn-Time-0.5.0-osx64.zip"
url "https://github.com/popcorn-official/popcorn-desktop/releases/download/v0.5.1/Popcorn-Time-0.5.1-osx64.zip"

auto_updates true
depends_on arch: :x86_64
Expand Down
2 changes: 1 addition & 1 deletion src/app/lib/views/seedbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@
selected = true;
}
$fileList.append(`<li class="file-item tooltipped${ selected ? '' : ' unselected' }">
<a class="tooltipped" data-titleholder="${file.name.replaceAll('.', '.\u200B')}" data-container="body" data-toggle="tooltip" data-placement="top" onmouseenter="if (this.offsetWidth < this.scrollWidth) { $(this).attr('data-original-title', $(this).attr('data-titleholder')); } else { $(this).attr('data-original-title', ''); }">${file.name}</a>
<a class="tooltipped" data-titleholder="${file.name.replace(/\./g, '.\u200B')}" data-container="body" data-toggle="tooltip" data-placement="top" onmouseenter="if (this.offsetWidth < this.scrollWidth) { $(this).attr('data-original-title', $(this).attr('data-titleholder')); } else { $(this).attr('data-original-title', ''); }">${file.name}</a>
<i class="fa fa-play item-play tooltipped" title="Watch Now" data-container="body" data-toggle="tooltip" data-placement="left"></i>
<i class="fa fa-download item-download tooltipped" title="Download" data-container="body" data-toggle="tooltip" data-placement="top"${ selected ? ' style="display:none"' : '' }></i>
<i class="fa fa-trash item-remove tooltipped" title="Remove" data-container="body" data-toggle="tooltip" data-placement="top"${ selected ? '' : ' style="display:none"' }></i>
Expand Down
2 changes: 1 addition & 1 deletion src/app/templates/file-selector.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<% if (Settings.activateSeedbox && !localFile) { %>
<i class="fa fa-download item-download tooltipped" title="<%=i18n.__('Download')%>" data-placement="top" data-container="body"></i>
<span style="margin-right: 12px"><% } else { %><span><% } %><%=Common.fileSize(file.length) %></span>
<a class="tooltipped" data-titleholder="<%= file.name.replaceAll('.', '.\u200B') %>" data-placement="top" data-container="body" onmouseenter="if (this.offsetWidth < this.scrollWidth) { $(this).attr('data-original-title', $(this).attr('data-titleholder')); } else { $(this).attr('data-original-title', ''); }"><%=file.name %></a>
<a class="tooltipped" data-titleholder="<%= file.name.replace(/\./g, '.\u200B') %>" data-placement="top" data-container="body" onmouseenter="if (this.offsetWidth < this.scrollWidth) { $(this).attr('data-original-title', $(this).attr('data-titleholder')); } else { $(this).attr('data-original-title', ''); }"><%=file.name %></a>
</li>
<% }}); %>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion src/app/templates/torrent-list.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<%_.each(torrents, function(torrent, k) { %>
<tr class="item-row" data-key="<%=k %>">
<td class="provider tooltipped<%= Settings.seriesUITransparency ? '' : ' transpOff' %>" <% if (torrent.source) { %>title="<%=torrent.source.split('//').pop().split('/')[0] %>" <% } else { %>title="<%=torrent.provider.toLowerCase() %>" style="cursor:default" <% } %>data-toggle="tooltip" data-container="body" data-placement="left"><img data-href="<%=torrent.source %>" src="<%=torrent.icon %>" <% if (!torrent.source) { %>style="cursor:default" <% } %>onerror="this.onerror=null; this.style.display='none'; this.parentElement.style.top='0'; this.parentElement.classList.add('fas', 'fa-link')" onload="this.onerror=null; this.onload=null;"/></td>
<td class="ellipsis item-play<%= Settings.seriesUITransparency ? '' : ' transpOff' %>"><span data-titleholder="<%=torrent.title.replaceAll('.', '.\u200B') %>" class="item-play tooltipped" data-toggle="tooltip" data-container="body" data-placement="top" onmouseenter="if (this.offsetWidth < this.scrollWidth) { $(this).attr('data-original-title', $(this).attr('data-titleholder')); } else { $(this).attr('data-original-title', ''); }"><%=torrent.title %></span></td>
<td class="ellipsis item-play<%= Settings.seriesUITransparency ? '' : ' transpOff' %>"><span data-titleholder="<%=torrent.title.replace(/\./g, '.\u200B') %>" class="item-play tooltipped" data-toggle="tooltip" data-container="body" data-placement="top" onmouseenter="if (this.offsetWidth < this.scrollWidth) { $(this).attr('data-original-title', $(this).attr('data-titleholder')); } else { $(this).attr('data-original-title', ''); }"><%=torrent.title %></span></td>
<td class="info item-play tooltipped<%= Settings.seriesUITransparency ? '' : ' transpOff' %>" title="<%= i18n.__('Seeds') %> &nbsp;/&nbsp; <%= i18n.__('Peers') %>" data-toggle="tooltip" data-container="body" data-placement="top"><%=torrent.seed || torrent.seeds || 0 %> / <%=torrent.peer || torrent.peers || 0 %></td>
<% if (torrent.quality) { %><td class="info item-play<%= Settings.seriesUITransparency ? '' : ' transpOff' %>"><%=torrent.quality %></td><% } %>
<% if (torrent.filesize) { %><td class="info item-play<%= Settings.seriesUITransparency ? '' : ' transpOff' %>"><%=torrent.filesize %></td><% } %>
Expand Down

0 comments on commit e484724

Please sign in to comment.