[FileManager] updated FileManager sources

Change-Id: I49f6ba404ea44e56b26a09d87db43eab680cef1b

diff --git a/js/app.helpers.js b/js/app.helpers.js
index 642d031..486f7e0 100644 (file)
--- a/js/app.helpers.js
+++ b/js/app.helpers.js
@@ -100,7 +100,7 @@ function Helpers() {
 
                        ext = ext.toLowerCase();
 
-                       if (ext === '.jpg' || ext === '.png' || ext === '.gif') {
+                       if (ext === '.jpg' || ext === '.png' || ext === '.gif' || ext === '.bmp') {
                                mime = 'image/*';
                        } else if (ext === '.mp4' || ext === '.ogv' || ext === '.avi' || ext === '.wmv') {
                                mime = 'video/*';

diff --git a/js/app.ui.js b/js/app.ui.js
index 415501f..debf39a 100644 (file)
--- a/js/app.ui.js
+++ b/js/app.ui.js
@@ -393,7 +393,8 @@ function Ui() {
                        $('.standardTabbar').hide();
                        $('div.editTabbar').show();
                        this.disableControlBarButtons($('div.editTabbar'), [this.EDIT_TABBAR_DELETE_ACTION, this.EDIT_TABBAR_COPY_ACTION, this.EDIT_TABBAR_MOVE_ACTION]);
-                       $('#fileList .folder .nodename').animate({'width': '70%'});
+                       $('#fileList .folder .nodename, #fileList > li > span.nodename')
+                               .animate({'width': '70%'});
                        this.showEditCheckBoxes();
                },
 
@@ -405,7 +406,8 @@ function Ui() {
                        this.clearTabbars();
                        $('div.editTabbar').hide();
                        $('.standardTabbar').show();
-                       $('#fileList .folder .nodename').animate({'width': '75%'});
+                       $('#fileList .folder .nodename,  #fileList > li > span.nodename')
+                               .animate({'width': '75%'});
                        this.hideEditCheckBoxes();
                        if (this.isFileListEmpty()) {
                                $('#editActionBtn').addClass('vhidden');
@@ -623,6 +625,7 @@ function Ui() {
                                listElements.push(this.templateManager.get('emptyFolder'));
                                // hide edit button for empty content
                                $('#editActionBtn').addClass('vhidden');
+                               this.handleCancelEditAction();
                        } else {
                                $('#editActionBtn').removeClass('vhidden');
                        }
@@ -636,7 +639,7 @@ function Ui() {
 
                        if (refresh === true && this.editMode === true) {
                                $.each($('#fileList .ui-checkbox input:checked'), function () {
-                                       checkedRows.push($(this).closest('li').attr('id'));
+                                       checkedRows.push($(this).closest('li').attr('uri'));
                                });
                        }
 
@@ -645,10 +648,10 @@ function Ui() {
                                .trigger('refresh')
                                .trigger('create');
 
-
                        if (this.editMode === true) {
                                $('.selectAll').show();
-                               $('#fileList .folder .nodename').css('width', '70%');
+                               $('#fileList .folder .nodename, #fileList > li > span.nodename')
+                                       .css('width', '70%');
                                $('ul#fileList > li').css('paddingLeft', '2rem');
                                $('.my-ui-checkbox').removeClass('hidden');
 
@@ -661,17 +664,27 @@ function Ui() {
                                                // restore checked checkboxes
                                                for (i = 0; i < checkedRowsLen; i += 1) {
                                                        this.setCheckboxValue(
-                                                               '#' + checkedRows[i] + ' input:checkbox',
+                                                               '#' +
+                                                               $('[uri="'+ checkedRows[i] +'"]').attr('id') +
+                                                               ' input:checkbox',
                                                                'checked'
                                                        );
                                                }
                                        } else {
                                                this.setCheckboxValue('.selectAll input', false);
+                                               // close confirm popup if visibible
+                                               if (
+                                                       $.mobile.popup.active &&
+                                                       $.mobile.popup.active.element.attr('id') === 'confirmPopup'
+                                                       ) {
+                                                               $.mobile.popup.active.close();
+                                               }
                                        }
                                }
                        } else {
                                $('.selectAll').hide();
-                               $('#fileList .folder .nodename').css('width', '75%');
+                               $('#fileList .folder .nodename, #fileList > li > span.nodename')
+                                       .css('width', '75%');
                                $('ul#fileList > li').css('paddingLeft', '0');
                                $('.my-ui-checkbox').addClass('hidden');
                        }