github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-16 10:03:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

FM changes

Browse source
This commit is contained in:
Serghey Rodin 2015-11-05 03:17:21 +02:00
parent f064c09667
commit d207b7a752
9 changed files with 117 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

26
web/js/file_manager.js
View file

@ -99,6 +99,10 @@ FM.showError = function(type, message) {
return;
}
if (ref.find('.results').length > 0) {
ref.find('.results').html(message);
}
}
else {
FM.popupClose();
@ -750,7 +754,7 @@ FM.bulkOperation = function(ref) {
}
FM.checkBulkStatus = function(bulkStatuses, acc) {
var status = false;
var status = true;
var msg = '';
if (bulkStatuses.length == acc.length) {
$.each(bulkStatuses, function(i, o) {
@ -759,18 +763,24 @@ FM.checkBulkStatus = function(bulkStatuses, acc) {
}
});
if (msg == '') {
status = true;
if (msg != '') {
status = false;
}
}
if (status == true) {
$('#popup .results').html(App.Constants.FM_DONE);
$('.controls').html('<p class="ok" onClick="FM.bulkPopupClose();">'+App.Constants.FM_DONE+'</p>');
//$('#popup .results').html(App.Constants.FM_DONE);
//$('.controls').html('<p class="ok" onClick="FM.bulkPopupClose();">'+App.Constants.FM_DONE+'</p>');
FM.popupClose();
var box = FM['TAB_' + tab];
var tab = FM.getTabLetter(FM.CURRENT_TAB);
FM.openAndSync(FM['TAB_' + tab + '_CURRENT_PATH'], box);
}
else {
$('#popup .results').html(msg);
$('.controls').html('<p class="ok" onClick="FM.bulkPopupClose();">'+App.Constants.FM_DONE+'</p>');
$('#popup .results').show().html(msg);
//$('.controls').html('<p class="ok" onClick="FM.bulkPopupClose();">'+App.Constants.FM_DONE+'</p>');
$('#popup .ok').hide();
}
}
@ -1249,7 +1259,7 @@ FM.unpackItem = function() {
var tpl = Tpl.get('popup_unpack', 'FM');
tpl.set(':FILENAME', src.name);
tpl.set(':DST_DIRNAME', (dst + '/' + src.name).replace('//', '/'));
tpl.set(':DST_DIRNAME', (dst).replace('//', '/'));
FM.popupOpen(tpl.finalize());
}

3
web/js/templates.js
View file

@ -46,6 +46,7 @@ App.Templates.html = {
</div>'],
popup_bulk_remove: ['<div class="confirm-box delete popup-box">\
<div class="message">'+App.Constants.FM_CONFIRM_DELETE_BULK+' (~!:NUMBER_OF_ITEMS~!)?</div>\
<div class="results"></div>\
<div class="controls">\
<p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
<p class="ok" onClick="FM.bulkRemoveDo();">'+App.Constants.FM_DELETE+'</p>\
@ -73,6 +74,7 @@ App.Templates.html = {
</div>'],*/
popup_delete: ['<div class="confirm-box delete popup-box">\
<div class="message">'+App.Constants.FM_CONFIRM_DELETE+' <span class="title">"~!:FILENAME~!"</span>?</div>\
<div class="warning warning-message"></div>\
<div class="controls">\
<p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
<p class="ok" onClick="FM.confirmDelete();">'+App.Constants.FM_DELETE+'</p>\
@ -84,6 +86,7 @@ App.Templates.html = {
<input type="text" id="copy_dest" value="~!:DST_FILENAME~!" class="new-title">\
</div>\
<div class="message">'+App.Constants.FM_EXISTING_FILES_WILL_BE_REPLACED+'</div>\
<div class="warning warning-message"></div>\
<div class="controls">\
<p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
<p class="ok" onClick="FM.confirmCopyItems();">'+App.Constants.FM_COPY+'</p>\