web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix lint errors

Browse Source
This commit is contained in:
yflory 2016-12-22 18:16:38 +01:00
parent 52a593c2c2
commit a10eac2773
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
www/file/fileObject.js
View File

@ -596,13 +596,16 @@ define([
var rootFiles = getRootFiles(); var rootFiles = getRootFiles();
var trashFiles = getTrashFiles(); var trashFiles = getTrashFiles();
var templateFiles = getTemplateFiles(); var templateFiles = getTemplateFiles();
var newPath, parentEl;
if (path && isPathInHrefArray(path)) { if (path && isPathInHrefArray(path)) {
var parentEl = findElement(files, newPath); newPath = decodeURIComponent(path).split(',');
parentEl = findElement(files, newPath);
parentEl.push(href); parentEl.push(href);
return;
} }
else if (path && name) { if (path && name) {
var newPath = decodeURIComponent(path).split(','); newPath = decodeURIComponent(path).split(',');
var parentEl = findElement(files, newPath); parentEl = findElement(files, newPath);
if (parentEl) { if (parentEl) {
var newName = getAvailableName(parentEl, name); var newName = getAvailableName(parentEl, name);
parentEl[newName] = href; parentEl[newName] = href;
@ -621,7 +624,7 @@ define([
var href = fileData.href; var href = fileData.href;
var test = files[FILES_DATA].some(function (o) { var test = files[FILES_DATA].some(function (o) {
o.href === href; return o.href === href;
}); });
if (!test) { if (!test) {
files[FILES_DATA].push(fileData); files[FILES_DATA].push(fileData);

6
www/file/main.js
View File

@ -18,7 +18,7 @@ define([
var $iframe = $('#pad-iframe').contents(); var $iframe = $('#pad-iframe').contents();
var ifrw = $('#pad-iframe')[0].contentWindow; var ifrw = $('#pad-iframe')[0].contentWindow;
//Cryptpad.addLoadingScreen(); Cryptpad.addLoadingScreen();
var onConnectError = function (info) { var onConnectError = function (info) {
Cryptpad.errorLoadingScreen(Messages.websocketError); Cryptpad.errorLoadingScreen(Messages.websocketError);
}; };
@ -956,7 +956,9 @@ define([
var $fileHeader = getFileListHeader(false); var $fileHeader = getFileListHeader(false);
$container.append($fileHeader); $container.append($fileHeader);
var keys = unsorted; var keys = unsorted;
var sortedFiles = sortElements(false, [rootName], keys, Cryptpad.getLSAttribute(SORT_FILE_BY), !getSortFileDesc(), true); var sortBy = Cryptpad.getLSAttribute(SORT_FILE_BY);
sortBy = sortBy === "" ? sortBy = 'title' : sortBy;
var sortedFiles = sortElements(false, [rootName], keys, sortBy, !getSortFileDesc(), true);
sortedFiles.forEach(function (href) { sortedFiles.forEach(function (href) {
var file = filesOp.getFileData(href); var file = filesOp.getFileData(href);
if (!file) { if (!file) {