Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

UI, Queue: Use html() instead of text(), otherwise special characters…

… fail to display properly. Update moxiecode/moxie@0aa2f1f.
  • Loading branch information...
commit a7449aed11004312f005ade8dd549c5b3f7bf5ff 1 parent 355a952
@jayarjo jayarjo authored
View
10 src/jquery.plupload.queue/jquery.plupload.queue.js
@@ -124,7 +124,7 @@
function updateTotalProgress() {
$('span.plupload_total_status', target).html(uploader.total.percent + '%');
$('div.plupload_progress_bar', target).css('width', uploader.total.percent + '%');
- $('span.plupload_upload_status', target).text(
+ $('span.plupload_upload_status', target).html(
_('Uploaded %d/%d files').replace(/%d\/%d/, uploader.total.uploaded+'/'+uploader.files.length)
);
}
@@ -172,9 +172,9 @@
$('span.plupload_total_file_size', target).html(plupload.formatSize(uploader.total.size));
if (uploader.total.queued === 0) {
- $('span.plupload_add_text', target).text(_('Add Files'));
+ $('span.plupload_add_text', target).html(_('Add Files'));
} else {
- $('span.plupload_add_text', target).text(_('%d files queued').replace(/%d/, uploader.total.queued));
+ $('span.plupload_add_text', target).html(_('%d files queued').replace(/%d/, uploader.total.queued));
}
$('a.plupload_start', target).toggleClass('plupload_disabled', uploader.files.length == (uploader.total.uploaded + uploader.total.failed));
@@ -223,7 +223,7 @@
// Rename file and glue extension back on
file.name = targetInput.val() + ext;
- targetSpan.text(file.name);
+ targetSpan.html(file.name);
targetInput.blur();
}
});
@@ -293,7 +293,7 @@
if (uploader.state === plupload.STARTED) {
$('li.plupload_delete a,div.plupload_buttons', target).hide();
$('span.plupload_upload_status,div.plupload_progress,a.plupload_stop', target).css('display', 'block');
- $('span.plupload_upload_status', target).text('Uploaded ' + uploader.total.uploaded + '/' + uploader.files.length + ' files');
+ $('span.plupload_upload_status', target).html('Uploaded ' + uploader.total.uploaded + '/' + uploader.files.length + ' files');
if (settings.multiple_queues) {
$('span.plupload_total_status,span.plupload_total_file_size', target).show();
View
10 src/jquery.ui.plupload/jquery.ui.plupload.js
@@ -562,7 +562,7 @@ $.widget("ui.plupload", {
.add('.plupload_started')
.removeClass('plupload_hidden');
- $('.plupload_upload_status', self.element).text(
+ $('.plupload_upload_status', self.element).html(
_('Uploaded %d/%d files').replace('%d/%d', up.total.uploaded+'/'+up.files.length)
);
@@ -676,9 +676,9 @@ $.widget("ui.plupload", {
var up = this.uploader;
if (up.total.queued === 0) {
- $('.ui-button-text', this.browse_button).text(_('Add Files'));
+ $('.ui-button-text', this.browse_button).html(_('Add Files'));
} else {
- $('.ui-button-text', this.browse_button).text(_('%d files queued').replace('%d', up.total.queued));
+ $('.ui-button-text', this.browse_button).html(_('%d files queued').replace('%d', up.total.queued));
}
up.refresh();
@@ -703,7 +703,7 @@ $.widget("ui.plupload", {
.html(plupload.formatSize(up.total.size))
.end()
.find('.plupload_upload_status')
- .text(_('Uploaded %d/%d files').replace('%d/%d', up.total.uploaded+'/'+up.files.length));
+ .html(_('Uploaded %d/%d files').replace('%d/%d', up.total.uploaded+'/'+up.files.length));
},
@@ -942,7 +942,7 @@ $.widget("ui.plupload", {
// Rename file and glue extension back on
if (e.keyCode === 13) {
file.name = nameInput.val() + ext;
- nameSpan.text(file.name);
+ nameSpan.html(file.name);
}
nameInput.blur();
}
2  src/moxie
@@ -1 +1 @@
-Subproject commit 752174d8c1dcd3bb9645995fc8951600e9d568f0
+Subproject commit 0aa2f1f3558157829691c53c4c2cbbbe2547104d
Please sign in to comment.
Something went wrong with that request. Please try again.