').attr('id', 'popup').html(html).flayer({
+ afterStart: function(elm) {
+ elm.find('input[type="text"]:first').focus();
+ }
+ });
}
FM.popupClose = function() {
+ clearTimeout(FM.Env.errorMessageHideTimeout);
return $('#popup').flayer_close();
}
FM.copyItems = function() {
var tab = FM.getTabLetter(FM.CURRENT_TAB);
var selected = $(FM['TAB_' + tab] ).find('.dir.selected');
+ if (selected.length == 0) {
+ return FM.displayError(
+ App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
+ );
+ }
+
+ if (selected.length > 1) { // multi operation
+ return FM.bulkCopy();
+ }
+
+
+ var src = selected.find('.source').val();
+ src = $.parseJSON(src);
+
+ if (FM.isItemPseudo(src)) {
+ return FM.displayError(
+ App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
+ );
+ }
+
+ var opposite_tab = 'A';
+ if (tab == 'A') {
+ opposite_tab = 'B';
+ }
+
+ var dst = FM['TAB_' + opposite_tab + '_CURRENT_PATH'];
+ if (dst == '') {
+ dst = GLOBAL.ROOT_DIR;
+ }
+
+ var tpl = Tpl.get('popup_copy', 'FM');
+ tpl.set(':SRC_FILENAME', src.full_path);
+ tpl.set(':DST_FILENAME', dst + '/' + src.name);
+ FM.popupOpen(tpl.finalize());
+}
+
+FM.confirmUnpackItem = function () {
+ var tab = FM.getTabLetter(FM.CURRENT_TAB);
+ var box = FM['TAB_' + tab];
+ var selected = $(FM['TAB_' + tab] ).find('.dir.selected');
+ if (selected.length == 0) {
+ return FM.displayError(
+ App.Constants.FM_NO_FILE_SELECTED
+ );
+ }
+
+ var opposite_tab = 'A';
+ if (tab == 'A') {
+ opposite_tab = 'B';
+ }
+
+ var src = selected.find('.source').val();
+ src = $.parseJSON(src);
+
+ if (FM.isItemPseudo(src)) {
+ return FM.displayError(
+ App.Constants.FM_NO_FILE_SELECTED
+ );
+ }
+
+ if (!FM.itemIsArchieve(src)) {
+ return FM.displayError(
+ App.Constants.FM_FILE_TYPE_NOT_SUPPORTED
+ );
+ }
+
+ var dst = FM['TAB_' + tab + '_CURRENT_PATH'];
+ if (dst == '') {
+ dst = GLOBAL.ROOT_DIR;
+ }
+
+ var params = {
+ item: src.full_path,
+ filename: src.name,
+ dir: FM['TAB_' + tab + '_CURRENT_PATH'],
+ dir_target: $('#unpack-destination').val()
+ };
+
+ App.Ajax.request('unpack_item', params, function(reply) {
+ if (reply.result == true) {
+ FM.popupClose();
+ FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]);
+ FM.open(FM['TAB_' + opposite_tab + '_CURRENT_PATH'], FM['TAB_' + opposite_tab]);
+ }
+ else {
+ FM.showError('unpack_item', reply.message);
+ }
+ });
+}
+
+FM.confirmPackItem = function () {
+ var tab = FM.getTabLetter(FM.CURRENT_TAB);
+ var box = FM['TAB_' + tab];
+ var selected = $(FM['TAB_' + tab] ).find('.dir.selected');
+ if (selected.length == 0) {
+ return FM.displayError(
+ App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
+ );
+ }
+
+ var opposite_tab = 'A';
+ if (tab == 'A') {
+ opposite_tab = 'B';
+ }
+
+ var src = selected.find('.source').val();
+ src = $.parseJSON(src);
+
+ if (FM.isItemPseudo(src)) {
+ return FM.displayError(
+ App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
+ );
+ }
+
+ var dst = FM['TAB_' + tab + '_CURRENT_PATH'];
+ if (dst == '') {
+ dst = GLOBAL.ROOT_DIR;
+ }
+
+ var params = {
+ item: src.full_path,
+ filename: src.name,
+ dir: FM['TAB_' + tab + '_CURRENT_PATH'],
+ dir_target: $('#pack-destination').val()
+ };
+
+
+ App.Ajax.request('pack_item', params, function(reply) {
+ if (reply.result == true) {
+ FM.popupClose();
+ FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]);
+ FM.open(FM['TAB_' + opposite_tab + '_CURRENT_PATH'], FM['TAB_' + opposite_tab]);
+ }
+ else {
+ FM.showError('unpack_item', reply.message);
+ }
+ });
+}
+
+FM.confirmCopyItems = function () {
+ var tab = FM.getTabLetter(FM.CURRENT_TAB);
+ var selected = $(FM['TAB_' + tab] ).find('.dir.selected');
if (!selected) {
- return alert('No file selected');
+ return FM.displayError(
+ App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
+ );
}
var opposite_tab = 'A';
@@ -583,24 +1251,36 @@ FM.copyItems = function() {
var src = selected.find('.source').val();
src = $.parseJSON(src);
- console.log(src);
+
+ if (FM.isItemPseudo(src)) {
+ return FM.displayError(
+ App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
+ );
+ }
+
+ var dest = $('#copy_dest').val();
+ if (dest == '') {
+ dest = GLOBAL.ROOT_DIR;
+ }
+
+ var action = FM.isItemFile(src) ? 'copy_file' : 'copy_directory';
var params = {
item: src.full_path,
filename: src.name,
dir: FM['TAB_' + tab + '_CURRENT_PATH'],
- dir_target: FM['TAB_' + opposite_tab + '_CURRENT_PATH']
+ dir_target: dest
};
- App.Ajax.request('copy_files', params, function(reply) {
- if (reply.result) {
+ App.Ajax.request(action, params, function(reply) {
+ if (reply.result == true) {
+ FM.popupClose();
FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]);
FM.open(FM['TAB_' + opposite_tab + '_CURRENT_PATH'], FM['TAB_' + opposite_tab]);
}
else {
- FM.showError('delete-items', reply.message);
+ FM.showError('copy-items', reply.message);
}
- //FM.popupClose();
});
}
@@ -608,14 +1288,24 @@ FM.downloadFiles = function() {
var tab = FM.getTabLetter(FM.CURRENT_TAB);
var selected = $(FM['TAB_' + tab] ).find('.dir.selected');
if (!selected) {
- return alert('No file selected');
+ return FM.displayError(
+ App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
+ );
}
var src = selected.find('.source').val();
src = $.parseJSON(src);
-
- if (src.type != 'f') {
- return alert('Only files can be dosnloaded in this version');
+
+ if (FM.isItemPseudo(src) || FM.isItemDir(src)) {
+ alert('Folder downloads are in progress atm');
+ }
+
+ if (FM.isItemPseudo(src)) {
+ if (FM.isItemPseudo(src)) {
+ return FM.displayError(
+ App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
+ );
+ }
}
var path = src.full_path;
@@ -633,11 +1323,19 @@ FM.confirmDelete = function() {
var box = FM['TAB_' + tab];
var selected = $(FM['TAB_' + tab] ).find('.dir.selected');
if (!selected) {
- return alert('No file selected');
+ return FM.displayError(
+ App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
+ );
}
var src = selected.find('.source').val();
src = $.parseJSON(src);
+
+ if (FM.isItemPseudo(src)) {
+ return FM.displayError(
+ App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
+ );
+ }
var params = {
item: src.full_path,
@@ -645,13 +1343,13 @@ FM.confirmDelete = function() {
};
App.Ajax.request('delete_files', params, function(reply) {
- if (reply.result) {
+ if (reply.result == true) {
+ FM.popupClose();
FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box);
}
else {
FM.showError('delete-items', reply.message);
}
- FM.popupClose();
});
}
@@ -659,62 +1357,66 @@ FM.deleteItems = function() {
var tab = FM.getTabLetter(FM.CURRENT_TAB);
var selected = $(FM['TAB_' + tab] ).find('.dir.selected');
if (selected.length == 0) {
- return alert('No file selected');
+ return FM.displayError(
+ App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
+ );
}
+ if (selected.length > 1) { // multi operation
+ return FM.bulkRemove();
+ }
+
+
+
var src = selected.find('.source').val();
src = $.parseJSON(src);
+
+ if (FM.isItemPseudo(src)) {
+ return FM.displayError(
+ App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
+ );
+ }
var tpl = Tpl.get('popup_delete', 'FM');
tpl.set(':FILENAME', src.name);
FM.popupOpen(tpl.finalize());
-
-
- /*var tab = FM.getTabLetter(FM.CURRENT_TAB);
- var confirmed = confirm(App.i18n.ARE_YOU_SURE);
- var box = FM.CURRENT_TAB;
-
- var delete_list = $(box).find('.selected');
- if (delete_list.length == 0) {
- return FM.showError('hint', 'No selected items');
- }
-
- var params = {
- items: [],
- dir: FM['TAB_' + tab + '_CURRENT_PATH']
- };
- $(delete_list).each(function(i, opt){
- var opt = $(o).find('.source').val();
- opt = $.parseJSON(opt);
- params.items.push(opt.name);
- });
-
- App.Ajax.request('delete_files', params, function(reply) {
- if (reply.result) {
- FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box);
- }
- else {
- FM.showError('delete-items', reply.message);
- }
- });*/
}
+FM.displayError = function(msg) {
+ if (FM.isPopupOpened()) {
+ var ref = FM.getPopupReference();
+ if (ref.find('.warning-message').length > 0) {
+ ref.find('.warning-message').html('
' + msg + '
');
+ ref.find('.warning-message').show();
+
+ clearInterval(FM.Env.errorMessageHideTimeout);
+ FM.Env.errorMessageHideTimeout =
+ setTimeout(function() {
+ ref.find('.warning-message').fadeOut();
+ }, FM.errorMessageTimeout);
+ return;
+ }
+ }
+
+ FM.popupClose();
+ var tpl = Tpl.get('popup_alert', 'FM');
+ tpl.set(':TEXT', msg);
+
+ FM.popupOpen(tpl.finalize());
+ //return alert(msg);
+}
+
FM.confirmCreateDir = function() {
var tab = FM.getTabLetter(FM.CURRENT_TAB);
var box = FM['TAB_' + tab];
- /*var selected = $(FM['TAB_' + tab] ).find('.dir.selected');
- if (!selected) {
- return alert('No file selected');
- }
-
- var src = selected.find('.source').val();
- src = $.parseJSON(src);*/
var dirname = $('#rename-title').val();
if (dirname.trim().length == 0) {
- return alert('Cannot be created.');
+ return FM.displayError(
+ App.Constants.FM_DIRECTORY_NAME_CANNOT_BE_EMPTY
+ );
}
var params = {
@@ -723,13 +1425,13 @@ FM.confirmCreateDir = function() {
};
App.Ajax.request('create_dir', params, function(reply) {
- if (reply.result) {
+ if (reply.result == true) {
+ FM.popupClose();
FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box);
}
else {
- FM.showError('create-file', reply.message);
+ FM.showError('create-dir', reply.message);
}
- FM.popupClose();
});
}
@@ -738,44 +1440,18 @@ FM.createDir = function() {
var tpl = Tpl.get('popup_create_dir', 'FM');
FM.popupOpen(tpl.finalize());
- /*var dirname = prompt('Enter dir name:');
- if (dirname.trim() != '') {
-
- var box = FM.CURRENT_TAB;
- var tab = FM.getTabLetter(box);
- var params = {
- 'dirname': dirname,
- 'dir': FM['TAB_' + tab + '_CURRENT_PATH']
- };
- App.Ajax.request('create_dir', params, function(reply) {
- if (reply.result) {
- FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box);
- }
- else {
- FM.showError('create-dir', reply.message);
- }
- });
- }
- else {
- FM.showError('dirname-empty', 'Dirname cannot be empty');
- }*/
}
FM.confirmCreateFile = function() {
var tab = FM.getTabLetter(FM.CURRENT_TAB);
var box = FM['TAB_' + tab];
- /*var selected = $(FM['TAB_' + tab] ).find('.dir.selected');
- if (!selected) {
- return alert('No file selected');
- }
-
- var src = selected.find('.source').val();
- src = $.parseJSON(src);*/
var filename = $('#rename-title').val();
if (filename.trim().length == 0) {
- return alert('Cannot be created.');
+ return FM.displayError(
+ App.Constants.FM_FILE_NAME_CANNOT_BE_EMPTY
+ );
}
var params = {
@@ -784,13 +1460,13 @@ FM.confirmCreateFile = function() {
};
App.Ajax.request('create_file', params, function(reply) {
- if (reply.result) {
+ if (reply.result == true) {
+ FM.popupClose();
FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box);
}
else {
FM.showError('create-file', reply.message);
}
- FM.popupClose();
});
}
@@ -799,27 +1475,6 @@ FM.createFile = function() {
var tpl = Tpl.get('popup_create_file', 'FM');
FM.popupOpen(tpl.finalize());
- /*var filename = prompt('Enter file name:');
- if (filename.trim() != '') {
-
- var box = FM.CURRENT_TAB;
- var tab = FM.getTabLetter(box);
- var params = {
- 'filename': filename,
- 'dir': FM['TAB_' + tab + '_CURRENT_PATH']
- };
- App.Ajax.request('create_file', params, function(reply) {
- if (reply.result) {
- FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box);
- }
- else {
- FM.showError('create-file', reply.message);
- }
- });
- }
- else {
- FM.showError('filename-empty', 'Filename cannot be empty');
- }*/
}
FM.showOrderBox = function(elm, tab) {
@@ -885,12 +1540,47 @@ FM.reOrderList = function(elm){
FM.open(path, tab);
}
+FM.isPopupOpened = function() {
+ var ref = $('#popup');
+ if (ref.length > 0) {
+ return true;
+ }
+
+ return false;
+}
+
+FM.getPopupReference = function() {
+ var ref = $('#popup');
+
+ return ref;
+}
+
+FM.handlePopupSubmit = function() {
+ try {
+ var method = $('#popup').find('.ok').attr('onClick');
+ if (method) {
+ method = method.replace('\(\);', '').replace('FM.', '');
+ if ('function' == typeof FM[method]) {
+ FM[method]();
+ }
+ }
+ }
+ catch(e) {
+
+ }
+}
+
+FM.handlePopupCancel = function() {
+ FM.popupClose();
+}
+
FM.init();
$(document).ready(function() {
+ $('.progress-container').hide();
//return alert('statechange: Back');
/*$(document).bind('keydown.up', function() {
@@ -915,6 +1605,17 @@ $(document).ready(function() {
$('.window ul').outerHeight(hgt);
+ shortcut.add("Esc",function() {
+ if (FM.isPopupOpened()) {
+ return FM.handlePopupCancel();
+ }
+ },{
+ 'type': 'keydown',
+ 'propagate': false,
+ 'disable_in_input': false,
+ 'target': document
+ });
+
shortcut.add("Down",function() {
FM.goDown();
},{
@@ -941,8 +1642,39 @@ $(document).ready(function() {
'disable_in_input': false,
'target': document
});
+
+ shortcut.add("Space",function() {
+ FM.selectCurrentElementAndGoToNext();
+ },{
+ 'type': 'keydown',
+ 'propagate': false,
+ 'disable_in_input': false,
+ 'target': document
+ });
+
+ shortcut.add("Insert",function() {
+ FM.selectCurrentElementAndGoToNext();
+ },{
+ 'type': 'keydown',
+ 'propagate': false,
+ 'disable_in_input': false,
+ 'target': document
+ });
+
+
+ shortcut.add("ctrl+a",function() {
+ FM.toggleAllItemsSelected();
+ },{
+ 'type': 'keydown',
+ 'propagate': false,
+ 'disable_in_input': false,
+ 'target': document
+ });
shortcut.add("Enter",function() {
+ if (FM.isPopupOpened()) {
+ return FM.handlePopupSubmit();
+ }
var tab = FM.getTabLetter(FM.CURRENT_TAB);
var elm = $(FM.CURRENT_TAB).find('.dir:eq('+FM['CURRENT_'+tab+'_LINE']+')');
@@ -964,6 +1696,8 @@ $(document).ready(function() {
});
+
+
/* is jQuery .live() has been removed in version 1.9 onwards
$(FM.TAB_A + ' .dir').live('click', function(evt) {
FM.selectItem(evt.target, FM.TAB_A);
@@ -973,12 +1707,19 @@ $(document).ready(function() {
});
*/
- $(FM.TAB_A).on('click', '.dir', function(evt) {
+ /*$(FM.TAB_A).on('click', '.dir', function(evt) {
+ //console.log(evt);
+ if (evt.ctrlKey || evt.metaKey || evt.altKey) {
+ return;
+ }
FM.selectItem(evt.target, FM.TAB_A);
});
$(FM.TAB_B).on('click', '.dir', function(evt) {
+ if (evt.ctrlKey || evt.metaKey || evt.altKey) {
+ return;
+ }
FM.selectItem(evt.target, FM.TAB_B);
- });
+ });*/
$(FM.TAB_A_MENU).on('click', '.sort-by', function(evt){
FM.showOrderBox($(evt.target), FM.TAB_A);
@@ -996,6 +1737,10 @@ $(document).ready(function() {
$(evt.target).closest('.warning-box').hide();
});
+ $('.menu-A .extract-btn').hide();
+ $('.menu-B .extract-btn').hide();
+
+
});
diff --git a/web/js/floating_layer.js b/web/js/floating_layer.js
index b0af2a903..84f6c91f7 100644
--- a/web/js/floating_layer.js
+++ b/web/js/floating_layer.js
@@ -2,7 +2,12 @@
{
jQuery.fn.flayer_close = function()
{
- jQuery(this).flayer.close();
+ try {
+ jQuery(this).flayer.close();
+ }
+ catch (e) {
+ fb.error(e);
+ }
}
jQuery.fn.flayer = function(params)
{
@@ -15,8 +20,9 @@
id : 'floating-box',
className : 'floating-box-class',
zIndex : 5000,
- beforeStart : function(){},
- beforeEnd : function(){},
+ beforeStart : function() {},
+ beforeEnd : function() {},
+ afterStart: function() {},
close : null,
closeClass : 'close-floating-layer',
outerClose : false,
@@ -207,6 +213,7 @@
jQuery(ref.content).append(jQuery(elm).removeClass('hidden'));
start_ovservers();
jQuery(ref.container).removeClass('hidden').css({'display':'block'});
+ config.afterStart(elm);
}
//
diff --git a/web/js/i18n.js.php b/web/js/i18n.js.php
index 7fe3b6192..dcf372709 100644
--- a/web/js/i18n.js.php
+++ b/web/js/i18n.js.php
@@ -46,3 +46,10 @@ if (!function_exists('__')) {
App.i18n.ARE_YOU_SURE = '';
App.Constants.UNLIM_TRANSLATED_VALUE = '';
+
+App.Constants.FM_DIRECTORY_NAME_CANNOT_BE_EMPTY = '';
+App.Constants.FM_FILE_NAME_CANNOT_BE_EMPTY = '';
+App.Constants.FM_NO_FILE_SELECTED = '';
+App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED = '';
+App.Constants.FM_FILE_TYPE_NOT_SUPPORTED = '';
+
diff --git a/web/js/templates.js b/web/js/templates.js
index 21b8dbef2..9cc360b1d 100644
--- a/web/js/templates.js
+++ b/web/js/templates.js
@@ -7,31 +7,65 @@ App.Templates.html = {
hint: ['']
},
// file manager
+ //
+
+//
\
+
FM: {
entry_line: ['
\
- \
+ \
+ \
\
\
~!:NAME~!\
~!:PERMISSIONS~!\
~!:OWNER~!\
- ~!:SIZE~!\
+ ~!:SIZE_UNIT~!\
+ ~!:SIZE_VALUE~!\
~!:DATE~!\
~!:TIME~!\
+ \
'],
+ popup_alert: [''],
+ popup_bulk: [''],
popup_delete: [''],
- popup_rename_: ['
\
-
Rename file "~!:FILENAME~!"
\
- \
-
\
+ popup_copy: [''],
+ popup_rename: ['
\
+
Original name: "~!:FILENAME~!"
\
+ \
+
\
+
\
+ \
\
\
cancel
\
@@ -43,15 +77,33 @@ App.Templates.html = {
\
'],
- popup_rename: ['
\
-
Extract archive "~!:FILENAME~!" to "~!:DIRNAME~!"
\
-
\
+ popup_pack: ['
\
+
Pack "~!:FILENAME~!" into:
\
\
- \
+ \
\
+
\
+ \
\
cancel
\
-
Extract
\
+
Pack
\
+
\
+
'],
+
+ popup_unpack: ['
\
+
Extract archive "~!:FILENAME~!" to:
\
+
\
+ \
+
\
+
\
+ \
+
\
'],
@@ -59,7 +111,7 @@ App.Templates.html = {
popup_create_file: ['
\
Create file
\
\
-
\
+
\
\
\
\
@@ -71,7 +123,7 @@ App.Templates.html = {
popup_create_dir: ['
\
Create directory
\
\
-
\
+
\
\
\
\
@@ -79,6 +131,12 @@ App.Templates.html = {
cancel
\
create
\
\
+
'],
+ popup_no_file_selected: ['
\
+
Please select a file
\
+
\
']
}
};
diff --git a/web/templates/file_manager/main.php b/web/templates/file_manager/main.php
index c2cfe315d..426cf4e96 100644
--- a/web/templates/file_manager/main.php
+++ b/web/templates/file_manager/main.php
@@ -16,19 +16,19 @@
-
+
+
'.$dir.'';
} ?> */ ?>
-
