diff --git a/build/js/ox.js b/build/js/ox.js index 2560185a..a7364fd9 100644 --- a/build/js/ox.js +++ b/build/js/ox.js @@ -1485,6 +1485,10 @@ Ox.formatPercent = function(num, total, dec) { return Ox.formatNumber(num / total * 100, dec) + '%' }; +Ox.formatResolution = function(arr, str) { + return arr[0] + ' x ' + arr[1] + ' ' + str; +} + Ox.formatString = function (s, args) { /* Python(ish) string formatting: * >>> format('{0}', ['zzz']) diff --git a/build/js/ox.ui.js b/build/js/ox.ui.js index 5c5766be..607943cc 100644 --- a/build/js/ox.ui.js +++ b/build/js/ox.ui.js @@ -246,7 +246,6 @@ requires }; }); that.api.init(getUserData(), function(result) { - // fixme: rename config to site? config = result.data.config, user = result.data.user; document.title = config.site.name; @@ -2984,16 +2983,18 @@ requires .appendTo(that); } - self.$input = $('') + self.$input = $(self.options.type == 'textarea' ? '