[FileManager] updated FileManager sources

Change-Id: Ibb12227a5fa07929f155b9a0d14228b37d201826

diff --git a/js/app.clipboard.js b/js/app.clipboard.js
index 6bcd892..cee9925 100644 (file)
--- a/js/app.clipboard.js
+++ b/js/app.clipboard.js
@@ -84,6 +84,22 @@ function Clipboard() {
                },
 
                /**
+                * Remove specified path and all children paths if already in clipboard
+                * @param {string} path full path
+                * @returns {number} current length of clipboard objects
+                */
+               removeRecursively: function Clipboard_removeRecursively(path) {
+                       var childPattern = new RegExp(path),
+                               index = this.data.length;
+                       while (index--) {
+                               if(childPattern.test(this.data[index])) {
+                                       this.data.splice(index, 1);
+                               }
+                       }
+                       return this.data.length;
+               },
+
+               /**
                 * Checks if specified path is already in clipboard
                 * @param {string} path full path
                 * @returns {boolean}

diff --git a/js/app.model.js b/js/app.model.js
index d29aaf6..aca30fe 100644 (file)
--- a/js/app.model.js
+++ b/js/app.model.js
@@ -157,9 +157,9 @@ function Model() {
                                self = this,
                                onDeleteNodeSuccess = function (node, isDir, fileobject) {
                                        try {
-                                               if (app.clipboard.remove(node.uri) === 0) {
-                                                       app.ui.refreshPasteActionBtn();
-                                               }
+                                               app.clipboard.removeRecursively(node.uri);
+                                               app.ui.refreshPasteActionBtn();
+
                                                this.refreshContent(fileobject.toURI());
                                        } catch (e) {
                                                console.error(e);