Skip to content

Commit 3722d2c

Browse files
joni2backjoni2back
committed
minor changes
1 parent 8fc8407 commit 3722d2c

3 files changed

Lines changed: 24 additions & 27 deletions

File tree

‎API.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## angular-filemanager API docs
1+
## angular-filemanager API v2 docs
22

33
#### Listing (URL: fileManagerConfig.listUrl, Method: POST)
44

‎src/js/controllers/main.js‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@
294294

295295
$scope.rename = function() {
296296
var item = $scope.singleSelection();
297-
var samePath = item.tempModel.path.join() === item.model.path.join();
297+
var samePath = item.tempModel.path.join('') === item.model.path.join('');
298298
if (samePath && $scope.fileNavigator.fileNameExists(item.tempModel.name)) {
299299
$scope.apiMiddleware.apiHandler.error = $translate.instant('error_invalid_filename');
300300
return false;
@@ -328,20 +328,17 @@
328328
};
329329

330330
$scope.validateSamePath = function(item) {
331-
var selectedPath = $rootScope.selectedModalPath.join('/').replace(/^\//, '');
332-
var selectedItemsPath = item && item.model.path.join('/').replace(/^\//, '');
331+
//validate change
332+
var selectedPath = $rootScope.selectedModalPath.join('');
333+
var selectedItemsPath = item && item.model.path.join('');
333334
return selectedItemsPath === selectedPath;
334335
};
335336

336337
$scope.getQueryParam = function(param) {
337-
var found;
338-
$window.location.search.substr(1).split('&').forEach(function(item) {
339-
if (param === item.split('=')[0]) {
340-
found = item.split('=')[1];
341-
return false;
342-
}
338+
var found = $window.location.search.substr(1).split('&').find(function(item) {
339+
return param === item.split('=')[0];
343340
});
344-
return found;
341+
return found && found.split('=')[1];
345342
};
346343

347344
$scope.changeLanguage($scope.getQueryParam('lang'));

‎src/js/providers/config.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
angular.module('FileManagerApp').provider('fileManagerConfig', function() {
44

55
var values = {
6-
appName: 'https://github.com/joni2back/angular-filemanager',
6+
appName: 'angular-filemanager v2',
77
defaultLang: 'en',
88

9-
listUrl: 'bridges/php/handler.php',
10-
uploadUrl: 'bridges/php/handler.php',
11-
renameUrl: 'bridges/php/handler.php',
12-
copyUrl: 'bridges/php/handler.php',
13-
moveUrl: 'bridges/php/handler.php',
14-
removeUrl: 'bridges/php/handler.php',
15-
editUrl: 'bridges/php/handler.php',
16-
getContentUrl: 'bridges/php/handler.php',
17-
createFolderUrl: 'bridges/php/handler.php',
18-
downloadFileUrl: 'bridges/php/handler.php',
19-
downloadMultipleUrl: 'bridges/php/handler.php',
20-
compressUrl: 'bridges/php/handler.php',
21-
extractUrl: 'bridges/php/handler.php',
22-
permissionsUrl: 'bridges/php/handler.php',
9+
listUrl: 'bridges/php/v2/handler.php',
10+
uploadUrl: 'bridges/php/v2/handler.php',
11+
renameUrl: 'bridges/php/v2/handler.php',
12+
copyUrl: 'bridges/php/v2/handler.php',
13+
moveUrl: 'bridges/php/v2/handler.php',
14+
removeUrl: 'bridges/php/v2/handler.php',
15+
editUrl: 'bridges/php/v2/handler.php',
16+
getContentUrl: 'bridges/php/v2/handler.php',
17+
createFolderUrl: 'bridges/php/v2/handler.php',
18+
downloadFileUrl: 'bridges/php/v2/handler.php',
19+
downloadMultipleUrl: 'bridges/php/v2/handler.php',
20+
compressUrl: 'bridges/php/v2/handler.php',
21+
extractUrl: 'bridges/php/v2/handler.php',
22+
permissionsUrl: 'bridges/php/v2/handler.php',
2323

2424
searchForm: true,
2525
sidebar: true,
@@ -49,7 +49,7 @@
4949
compressAsync: false,
5050
extractAsync: false,
5151

52-
isEditableFilePattern: /\.(txt|diff?|patch|asc|cnf|cfg|conf|html?|.html|cfm|cgi|aspx?|ini|pl|py|md|css|cs|js|jsp|log|htaccess|htpasswd|gitignore|gitattributes|env|json|atom|eml|rss|markdown|sql|xml|xslt?|sh|rb|as|bat|cmd|cob|for|ftn|frm|frx|inc|lisp|scm|coffee|php[3-6]?|java|c|cbl|go|h|scala|vb|tmpl|lock|go|yml|yaml|tsv|lst)$/i,
52+
isEditableFilePattern: /\.(txt|diff?|patch|svg|asc|cnf|cfg|conf|html?|.html|cfm|cgi|aspx?|ini|pl|py|md|css|cs|js|jsp|log|htaccess|htpasswd|gitignore|gitattributes|env|json|atom|eml|rss|markdown|sql|xml|xslt?|sh|rb|as|bat|cmd|cob|for|ftn|frm|frx|inc|lisp|scm|coffee|php[3-6]?|java|c|cbl|go|h|scala|vb|tmpl|lock|go|yml|yaml|tsv|lst)$/i,
5353
isImageFilePattern: /\.(jpe?g|gif|bmp|png|svg|tiff?)$/i,
5454
isExtractableFilePattern: /\.(gz|tar|rar|g?zip)$/i,
5555
tplPath: 'src/templates'

0 commit comments

Comments
 (0)