pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some small mistakes

Browse source
This commit is contained in:
Salandora 2015-10-08 15:26:58 +02:00
parent 05d8b0ac07
commit 9429456c5f
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/octoprint/static/js/app/client/files.js
View file

@ -28,13 +28,12 @@
};
var preProcessList = function(response) {
recursiveCheck = function(element, index, list) {
var recursiveCheck = function(element, index, list) {
if (!element.hasOwnProperty("parent")) element.parent = { children: list, parent: undefined };
if (!element.hasOwnProperty("size")) element.size = undefined;
if (!element.hasOwnProperty("date")) element.date = undefined;
if (element.type == "folder")
{
if (element.type == "folder") {
_.each(element.children, function(e, i, l) {
e.parent = element;
recursiveCheck(e, i, l);
@ -103,7 +102,7 @@
if (!element || !element.hasOwnProperty("parent") || element.parent == undefined)
return "";
recursivePath = function(element, path) {
var recursivePath = function(element, path) {
if (element.hasOwnProperty("parent") && element.parent != undefined)
return recursivePath(element.parent, element.name + "/" + path);
@ -114,7 +113,7 @@
},
elementByPath: function(location, startElement) {
recursiveSearch = function(location, element) {
var recursiveSearch = function(location, element) {
if (location.length == 0)
return element;
@ -124,7 +123,7 @@
var name = location.shift();
for(var i = 0; i < element.children.length; i++) {
if (name == element.children[i].name) {
return recursivePath(location, element.children[i]);
return recursiveSearch(location, element.children[i]);
}
}