wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4614 from nextcloud/js-fix-dialogs-and-octemplate

Browse source 
Fix variable definitions in oc dialogs
This commit is contained in:
Lukas Reschke 2017-05-01 16:54:53 +02:00 committed by GitHub
commit 99f98ca343
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/js/js.js
View file

@ -150,7 +150,7 @@ var OCP = {},
_.defaults(allOptions, defaultOptions);
var _build = function (text, vars) {
var vars = vars || [];
vars = vars || [];
return text.replace(/{([^{}]*)}/g,
function (a, b) {
var r = (vars[b]);

6
core/js/oc-dialogs.js
View file

@ -813,11 +813,13 @@ var OCdialogs = {
$.each(files, function(idx, entry) {
entry.icon = OC.MimeType.getIconUrl(entry.mimetype);
var simpleSize, sizeColor;
if (typeof(entry.size) !== 'undefined' && entry.size >= 0) {
var simpleSize = humanFileSize(parseInt(entry.size, 10), true);
var sizeColor = Math.round(160 - Math.pow((entry.size / (1024 * 1024)), 2));
simpleSize = humanFileSize(parseInt(entry.size, 10), true);
sizeColor = Math.round(160 - Math.pow((entry.size / (1024 * 1024)), 2));
} else {
simpleSize = t('files', 'Pending');
sizeColor = 80;
}
var $row = self.$listTmpl.octemplate({
type: entry.type,

2
core/js/octemplate.js
View file

@ -94,7 +94,7 @@
};
$.fn.octemplate = function(vars, options) {
var vars = vars ? vars : {};
vars = vars || {};
if(this.length) {
var _template = Object.create(Template);
return _template.init(vars, options, this);