[FileManager] updated FileManager sources

Change-Id: Id7ae81e50f844ed4c4b46acbff0fd70110431e77

diff --git a/js/app.model.js b/js/app.model.js
index 9110171..cf386f2 100644 (file)
--- a/js/app.model.js
+++ b/js/app.model.js
@@ -155,9 +155,14 @@ function Model() {
                deleteNodes: function Model_deleteNodes(nodes, dir, onSuccess, onError) {
                        var len = nodes.length,
                                self = this,
-                               onDeleteNodeSuccess = function (nodeId, isDir) {
+                               onDeleteNodeSuccess = function (node, isDir, fileobject) {
+                                       try {
+                                               this.refreshContent(fileobject.toURI());
+                                       } catch (e) {
+                                               console.error(e);
+                                       }
                                        if (typeof onSuccess === 'function') {
-                                               onSuccess(nodeId);
+                                               onSuccess(node.id);
                                        }
                                },
                                onDeleteNodeError = function (e) {
@@ -169,21 +174,26 @@ function Model() {
                                i;
 
                        for (i = 0; i < len; i = i + 1) {
-                               if (nodes[i].folder) {
-                                       dir.deleteDirectory(
-                                               nodes[i].uri,
-                                               true,
-                                               onDeleteNodeSuccess.bind(this, nodes[i].id, true),
-                                               onDeleteNodeError
-                                       );
-                               } else {
-                                       dir.deleteFile(
-                                               nodes[i].uri,
-                                               onDeleteNodeSuccess.bind(this, nodes[i].id, false),
-                                               onDeleteNodeError
-                                       );
-                                       this.resolveAndRefresh(nodes[i]);
-                               }
+                               tizen.filesystem.resolve(
+                                       nodes[i].uri,
+                                       function (node, fileobject) {
+                                               if (node.folder) {
+                                                       dir.deleteDirectory(
+                                                               node.uri,
+                                                               true,
+                                                               onDeleteNodeSuccess.bind(this, node, true, fileobject),
+                                                               onDeleteNodeError
+                                                       );
+                                               } else {
+                                                       dir.deleteFile(
+                                                               node.uri,
+                                                               onDeleteNodeSuccess.bind(this, node, false, fileobject),
+                                                               onDeleteNodeError
+                                                       );
+                                               }
+                                       }.bind(this, nodes[i]),
+                                       null
+                               );
                        }
                },
 
@@ -248,7 +258,8 @@ function Model() {
                moveNodes: function Model_moveNodes(dir, paths, destinationPath, onSuccess) {
                        var len = paths.length, self = this,
                                moved = 0,
-                               onMoveNodeSuccess = function (file) {
+                               onMoveNodeSuccess = function (oldfile, file) {
+                                       self.refreshContent(oldfile.toURI());
                                        self.refreshContent(file.toURI());
                                        moved += 1;
                                        if (moved === len) {
@@ -273,10 +284,14 @@ function Model() {
                                for (i = 0; i < len; i = i + 1) {
                                        decision = true;
                                        sourceName = paths[i].split('/').pop();
-
                                        try {
-                                               dir.moveTo(paths[i], destinationPath + '/' + sourceName, true, onMoveNodeSuccess, onMoveNodeFailure);
-                                               self.resolveAndRefresh(paths[i]);
+                                               tizen.filesystem.resolve(
+                                                       paths[i],
+                                                       function (path, destinationPath, sourceName, oldfile) {
+                                                               dir.moveTo(path, destinationPath + '/' + sourceName, true, onMoveNodeSuccess.bind(self, oldfile), onMoveNodeFailure);
+                                                       }.bind(self, paths[i], destinationPath, sourceName),
+                                                       null
+                                               );
                                        } catch (e) {
                                                console.error(e);
                                        }

diff --git a/js/app.ui.js b/js/app.ui.js
index aa84657..6491570 100644 (file)
--- a/js/app.ui.js
+++ b/js/app.ui.js
@@ -198,7 +198,11 @@ function Ui() {
                        $('#deleteActionBtn').on('tap', this.handleDeleteAction.bind(this));
 
                        // cancel edit
-                       $('#cancelActionBtn').on('tap', this.handleCancelEditAction.bind(this));
+                       $('#cancelActionBtn').on('tap', function (e) {
+                               e.preventDefault();
+                               e.stopPropagation();
+                               self.handleCancelEditAction();
+                       });
 
                        // copy action
                        $('#copyActionBtn').on('tap', this.handleCopyAction.bind(this));