Merge remote-tracking branch 'upstream/master'

2016-02-02 18:11:06 +01:00 · 2016-02-02 18:11:06 +01:00 · aa49c6978f
commit aa49c6978f
parent 9896e39579 8423edb3dc
2 changed files with 2 additions and 1 deletions
--- a/200.jade
+++ b/200.jade
@ -17,7 +17,7 @@ html(ng-app='BTorrent', lang='en')
    header
      h1
        | βTorrent
-        span.version  v0.12.0
+        span.version  v0.12.1
    #view(ng-view)
    footer
      a.button(href="https://github.com/DiegoRBaquero/BTorrent/issues", target="_blank")
--- a/app.coffee
+++ b/app.coffee
@ -125,6 +125,7 @@ app.controller 'BTorrentCtrl', ['$scope','$rootScope','$http','$log','$location'
      file.select(file.priority)

  $rootScope.onTorrent = (torrent, isSeed) ->
+    dbg torrent.magnetURI
    torrent.safeTorrentFileURL = torrent.torrentFileBlobURL
    torrent.fileName = torrent.name + '.torrent'
    if !isSeed