|
@@ -99,7 +99,7 @@
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
var initialPath = $.trim(self.options.initialPath);
|
|
var initialPath = $.trim(self.options.initialPath);
|
|
|
- if (initialPath && initialPath.toLowerCase().indexOf('s3') > -1 && $(self.element).data('fs').indexOf('s3') > -1) {
|
|
|
|
|
|
|
+ if (initialPath && initialPath.toLowerCase().indexOf('s3a') > -1 && $(self.element).data('fs').indexOf('s3') > -1) {
|
|
|
self.options.fsSelected = 's3';
|
|
self.options.fsSelected = 's3';
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -147,10 +147,10 @@
|
|
|
self.options.fsSelected = fs;
|
|
self.options.fsSelected = fs;
|
|
|
var storedPath = $.totalStorage(STORAGE_PREFIX + self.options.user + self.options.fsSelected);
|
|
var storedPath = $.totalStorage(STORAGE_PREFIX + self.options.user + self.options.fsSelected);
|
|
|
if (storedPath !== null) {
|
|
if (storedPath !== null) {
|
|
|
- if (fs === 's3a' && storedPath.toLowerCase().indexOf('s3a') === -1) {
|
|
|
|
|
|
|
+ if (fs === 's3' && storedPath.toLowerCase().indexOf('s3') === -1) {
|
|
|
self.navigateTo('S3A://');
|
|
self.navigateTo('S3A://');
|
|
|
}
|
|
}
|
|
|
- else if (fs !== 's3a' && storedPath.toLowerCase().indexOf('s3a') > -1) {
|
|
|
|
|
|
|
+ else if (fs !== 's3' && storedPath.toLowerCase().indexOf('s3') > -1) {
|
|
|
self.navigateTo('');
|
|
self.navigateTo('');
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
@@ -158,7 +158,7 @@
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
- self.navigateTo(fs === 's3a' ? 'S3A://' : '');
|
|
|
|
|
|
|
+ self.navigateTo(fs === 's3' ? 'S3A://' : '');
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
$li.appendTo($ul);
|
|
$li.appendTo($ul);
|
|
@@ -375,7 +375,7 @@
|
|
|
_parent.options.onError();
|
|
_parent.options.onError();
|
|
|
}
|
|
}
|
|
|
if (e.status === 404 || e.status === 500) {
|
|
if (e.status === 404 || e.status === 500) {
|
|
|
- _parent.navigateTo(_parent.options.errorRedirectPath != "" ? _parent.options.errorRedirectPath : (_parent.options.fsSelected === 's3a' ? 'S3A://' : '/?default_to_home'));
|
|
|
|
|
|
|
+ _parent.navigateTo(_parent.options.errorRedirectPath != "" ? _parent.options.errorRedirectPath : (_parent.options.fsSelected === 's3' ? 'S3A://' : '/?default_to_home'));
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
console.error(e);
|
|
console.error(e);
|
|
@@ -425,7 +425,7 @@
|
|
|
$.post('/filebrowser/api/get_filesystems', function (data) {
|
|
$.post('/filebrowser/api/get_filesystems', function (data) {
|
|
|
var initialPath = $.trim(self.options.initialPath);
|
|
var initialPath = $.trim(self.options.initialPath);
|
|
|
if (data && data.status == 0) {
|
|
if (data && data.status == 0) {
|
|
|
- if (initialPath && initialPath.toLowerCase().indexOf('s3') > -1 && data.filesystems['s3']) {
|
|
|
|
|
|
|
+ if (initialPath && initialPath.toLowerCase().indexOf('s3a') > -1 && data.filesystems['s3']) {
|
|
|
self.options.fsSelected = 's3';
|
|
self.options.fsSelected = 's3';
|
|
|
}
|
|
}
|
|
|
self.setFileSystems(data.filesystems);
|
|
self.setFileSystems(data.filesystems);
|