').appendTo($table);
$('').text(Messages.upload_name).appendTo($thead);
$(' | ').text(Messages.upload_size).appendTo($thead);
@@ -46,7 +46,7 @@ define([
$(' | ').text(Messages.cancel).appendTo($thead);
var createTableContainer = function ($body) {
- File.$container = $('', { id: 'uploadStatusContainer' }).append($table).appendTo($body);
+ File.$container = $(' ', { id: 'cp-fileupload' }).append($table).appendTo($body);
return File.$container;
};
@@ -74,11 +74,11 @@ define([
var $row = $table.find('tr[id="'+id+'"]');
- $row.find('.upCancel').html('-');
- var $pv = $row.find('.progressValue');
- var $pb = $row.find('.progressContainer');
- var $pc = $row.find('.upProgress');
- var $link = $row.find('.upLink');
+ $row.find('.cp-fileupload-table-cancel').html('-');
+ var $pv = $row.find('.cp-fileupload-table-progress-value');
+ var $pb = $row.find('.cp-fileupload-table-progress-container');
+ var $pc = $row.find('.cp-fileupload-table-progress');
+ var $link = $row.find('.cp-fileupload-table-link');
var sframeChan = common.getSframeChannel();
@@ -180,27 +180,27 @@ define([
$table.show();
var estimate = FileCrypto.computeEncryptedSize(obj.blob.byteLength, obj.metadata);
- var $progressBar = $(' ', {'class':'progressContainer'});
- var $progressValue = $(' ', {'class':'progressValue'}).text(Messages.upload_pending);
+ var $progressBar = $('', {'class':'cp-fileupload-table-progress-container'});
+ var $progressValue = $(' ', {'class':'cp-fileupload-table-progress-value'}).text(Messages.upload_pending);
var $tr = $('', {id: id}).appendTo($table);
- var $cancel = $('', {'class': 'cancel fa fa-times'}).click(function () {
+ var $cancel = $('', {'class': 'cp-fileupload-table-cancel-button fa fa-times'}).click(function () {
queue.queue = queue.queue.filter(function (el) { return el.id !== id; });
$cancel.remove();
- $tr.find('.upCancel').text('-');
- $tr.find('.progressValue').text(Messages.upload_cancelled);
+ $tr.find('.cp-fileupload-table-cancel').text('-');
+ $tr.find('.cp-fileupload-table-progress-value').text(Messages.upload_cancelled);
});
var $link = $('', {
- 'class': 'upLink',
+ 'class': 'cp-fileupload-table-link',
'rel': 'noopener noreferrer'
}).text(obj.metadata.name);
$('').append($link).appendTo($tr);
$(' | ').text(prettySize(estimate)).appendTo($tr);
- $(' | ', {'class': 'upProgress'}).append($progressBar).append($progressValue).appendTo($tr);
- $(' | ', {'class': 'upCancel'}).append($cancel).appendTo($tr);
+ $(' | ', {'class': 'cp-fileupload-table-progress'}).append($progressBar).append($progressValue).appendTo($tr);
+ $(' | ', {'class': 'cp-fileupload-table-cancel'}).append($cancel).appendTo($tr);
queue.next();
};
@@ -253,14 +253,14 @@ define([
e.preventDefault();
e.stopPropagation();
counter++;
- $hoverArea.addClass('hovering');
+ $hoverArea.addClass('cp-fileupload-hovering');
})
.on('dragleave', function (e) {
e.preventDefault();
e.stopPropagation();
counter--;
if (counter <= 0) {
- $hoverArea.removeClass('hovering');
+ $hoverArea.removeClass('cp-fileupload-hovering');
}
});
@@ -274,7 +274,7 @@ define([
var dropped = e.originalEvent.dataTransfer.files;
counter = 0;
- $hoverArea.removeClass('hovering');
+ $hoverArea.removeClass('cp-fileupload-hovering');
onFileDrop(dropped, e);
});
};
diff --git a/www/common/sframe-common-history.js b/www/common/sframe-common-history.js
index e6c342b94..3b95674bc 100644
--- a/www/common/sframe-common-history.js
+++ b/www/common/sframe-common-history.js
@@ -81,9 +81,9 @@ define([
var states = [];
var c = states.length - 1;
- var $hist = $toolbar.find('.cryptpad-toolbar-history');
- var $left = $toolbar.find('.cryptpad-toolbar-leftside');
- var $right = $toolbar.find('.cryptpad-toolbar-rightside');
+ var $hist = $toolbar.find('.cp-toolbar-history');
+ var $left = $toolbar.find('.cp-toolbar-leftside');
+ var $right = $toolbar.find('.cp-toolbar-rightside');
var $cke = $toolbar.find('.cke_toolbox_main');
$hist.html('').show();
@@ -111,9 +111,9 @@ define([
var val = states[i].getContent().doc;
c = i;
if (typeof onUpdate === "function") { onUpdate(); }
- $hist.find('.next, .previous').css('visibility', '');
- if (c === states.length - 1) { $hist.find('.next').css('visibility', 'hidden'); }
- if (c === 0) { $hist.find('.previous').css('visibility', 'hidden'); }
+ $hist.find('.cp-toolbar-history-next, .cp-toolbar-history-previous').css('visibility', '');
+ if (c === states.length - 1) { $hist.find('.cp-toolbar-history-next').css('visibility', 'hidden'); }
+ if (c === 0) { $hist.find('.cp-toolbar-history-previous').css('visibility', 'hidden'); }
return val || '';
};
@@ -128,18 +128,18 @@ define([
var display = function () {
$hist.html('');
var $prev =$(' | |