summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Stephen Boyd <bebarino@gmail.com>2009-11-24 19:51:40 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-25 00:06:32 -0800
commit6821dee9a91131e1a003ee65b2f4218a19ea8f3d (patch)
treeb6fee430e4d5e435d2fe2585b71dbed3baf263fa
parentgitweb.js: Harden setting blamed commit info in incremental blame (diff)
downloadtgif-6821dee9a91131e1a003ee65b2f4218a19ea8f3d.tar.xz
gitweb.js: fix padLeftStr() and its usage
It seems that in Firefox-3.5 inserting &nbsp; with javascript inserts the literal &nbsp; instead of a space. Fix this by inserting the unicode representation for &nbsp; instead. Also fix the off-by-one error in the padding calculation that was causing one less space to be inserted than was requested by the caller. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Cc: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--gitweb/gitweb.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/gitweb/gitweb.js b/gitweb/gitweb.js
index 5292c37d2c..2a25b7cc47 100644
--- a/gitweb/gitweb.js
+++ b/gitweb/gitweb.js
@@ -64,19 +64,19 @@ function fixLinks() {
/**
* pad number N with nonbreakable spaces on the left, to WIDTH characters
- * example: padLeftStr(12, 3, '&nbsp;') == '&nbsp;12'
- * ('&nbsp;' is nonbreakable space)
+ * example: padLeftStr(12, 3, '\u00A0') == '\u00A012'
+ * ('\u00A0' is nonbreakable space)
*
* @param {Number|String} input: number to pad
* @param {Number} width: visible width of output
- * @param {String} str: string to prefix to string, e.g. '&nbsp;'
+ * @param {String} str: string to prefix to string, e.g. '\u00A0'
* @returns {String} INPUT prefixed with (WIDTH - INPUT.length) x STR
*/
function padLeftStr(input, width, str) {
var prefix = '';
width -= input.toString().length;
- while (width > 1) {
+ while (width > 0) {
prefix += str;
width--;
}
@@ -192,7 +192,7 @@ function updateProgressInfo() {
if (div_progress_info) {
div_progress_info.firstChild.data = blamedLines + ' / ' + totalLines +
- ' (' + padLeftStr(percentage, 3, '&nbsp;') + '%)';
+ ' (' + padLeftStr(percentage, 3, '\u00A0') + '%)';
}
if (div_progress_bar) {