Merge pull request #87 from robbielj/patch-2
Clean up a placeholder character which may prevent webui from loading normally
This commit is contained in:
commit
534218f0e1
|
@ -285,7 +285,7 @@ function(
|
||||||
if (files) {
|
if (files) {
|
||||||
var cfiles = ctx.files;
|
var cfiles = ctx.files;
|
||||||
for (var i = 0; i < files.length; ++i) {
|
for (var i = 0; i < files.length; ++i) {
|
||||||
var cfile = cfiles[i] || (cfiles[i] = {});
|
var cfile = cfiles[i] || (cfiles[i] = {});
|
||||||
var file = files[i];
|
var file = files[i];
|
||||||
if (file.path !== cfile.path) {
|
if (file.path !== cfile.path) {
|
||||||
cfile.path = file.path;
|
cfile.path = file.path;
|
||||||
|
@ -318,7 +318,7 @@ function(
|
||||||
delete ctx.bittorrent;
|
delete ctx.bittorrent;
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.name = btName || dlName || "Unknown";
|
ctx.name = btName || dlName || "Unknown";
|
||||||
|
|
||||||
// collapse the download details initially
|
// collapse the download details initially
|
||||||
if (ctx.collapsed === undefined) {
|
if (ctx.collapsed === undefined) {
|
||||||
|
@ -353,7 +353,7 @@ function(
|
||||||
return (d.totalLength-d.completedLength) / d.downloadSpeed;
|
return (d.totalLength-d.completedLength) / d.downloadSpeed;
|
||||||
}
|
}
|
||||||
|
|
||||||
scope.getProgressClass = function(d) {
|
scope.getProgressClass = function(d) {
|
||||||
switch (d.status) {
|
switch (d.status) {
|
||||||
case "paused":
|
case "paused":
|
||||||
return "progress-info";
|
return "progress-info";
|
||||||
|
|
|
@ -61,7 +61,7 @@ angular
|
||||||
},
|
},
|
||||||
yaxis: {
|
yaxis: {
|
||||||
position: "right",
|
position: "right",
|
||||||
ticks: function(axis) {
|
ticks: function(axis) {
|
||||||
var res = [0];
|
var res = [0];
|
||||||
var round = Math.max(1, Math.ceil(axis.max / yTickBase));
|
var round = Math.max(1, Math.ceil(axis.max / yTickBase));
|
||||||
var step = Math.max(1, Math.ceil(round / yTicks));
|
var step = Math.max(1, Math.ceil(round / yTicks));
|
||||||
|
|
|
@ -12,7 +12,7 @@ angular.module('webui.filters.bytes', ["webui.services.utils"])
|
||||||
|
|
||||||
return function(time) {
|
return function(time) {
|
||||||
time = parseInt(time, 10);
|
time = parseInt(time, 10);
|
||||||
if (!time || !isFinite(time)) return "∞";
|
if (!time || !isFinite(time)) return "∞";
|
||||||
var secs = time % 60;
|
var secs = time % 60;
|
||||||
if (time < 60) return secs + "s";
|
if (time < 60) return secs + "s";
|
||||||
var mins = Math.floor((time % 3600) / 60)
|
var mins = Math.floor((time % 3600) / 60)
|
||||||
|
|
|
@ -39,7 +39,7 @@ function(syscall, time, alerts, utils, rootScope, uri) {
|
||||||
timeout = null;
|
timeout = null;
|
||||||
|
|
||||||
subscriptions = _.filter(subscriptions, function(e) {
|
subscriptions = _.filter(subscriptions, function(e) {
|
||||||
return !!e && e.once !== 2;
|
return !!e && e.once !== 2;
|
||||||
});
|
});
|
||||||
var subs = subscriptions.slice();
|
var subs = subscriptions.slice();
|
||||||
if (!subs.length) {
|
if (!subs.length) {
|
||||||
|
|
|
@ -11,7 +11,7 @@ angular.module('webui.services.utils', [])
|
||||||
return rndBuffer;
|
return rndBuffer;
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!window.crypto || !crypto.getRandomValues) {
|
if (!window.crypto || !crypto.getRandomValues) {
|
||||||
return rnd16Weak;
|
return rnd16Weak;
|
||||||
}
|
}
|
||||||
return function() {
|
return function() {
|
||||||
|
@ -82,7 +82,7 @@ angular.module('webui.services.utils', [])
|
||||||
return function() {
|
return function() {
|
||||||
var r = rnd16();
|
var r = rnd16();
|
||||||
r[6] = (r[6] & 0xf) | 0x40; // Version 4
|
r[6] = (r[6] & 0xf) | 0x40; // Version 4
|
||||||
r[8] = (r[8] & 0x3f) | 0x80; // Version 4y
|
r[8] = (r[8] & 0x3f) | 0x80; // Version 4y
|
||||||
return bt[r[0]] + bt[r[1]] + bt[r[2]] + bt[r[3]] + "-" +
|
return bt[r[0]] + bt[r[1]] + bt[r[2]] + bt[r[3]] + "-" +
|
||||||
bt[r[4]] + bt[r[5]] + "-" +
|
bt[r[4]] + bt[r[5]] + "-" +
|
||||||
bt[r[6]] + bt[r[7]] + "-" +
|
bt[r[6]] + bt[r[7]] + "-" +
|
||||||
|
|
Loading…
Reference in New Issue
Block a user