Skip to content

Commit d1ed31a

Browse files
committed
pick files - can stop execution in callback + translations fix
1 parent 1753366 commit d1ed31a

File tree

5 files changed

+31
-7
lines changed

5 files changed

+31
-7
lines changed

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@ This project is under free license. If you want to support the angular-filemanag
1313
![](https://raw.githubusercontent.com/joni2back/angular-filemanager/master/screenshot.gif)
1414

1515
### Features
16-
- Multilanguage (English / 简体中文 / Spanish / Portuguese / French / German / Slovak / Hebrew)
16+
- Multilanguage (
17+
English, Chinese, Spanish, Russian, Portuguese, French, German, Slovak, Hebrew, Persan, Ukrainian, Turkish)
1718
- Multiple templates (List / Icons)
1819
- Multiple file upload
1920
- Multiple file support
21+
- Pick files callback for third parties apps
2022
- Search files
2123
- Directory tree navigation
2224
- Copy, Move, Rename (Interactive UX)
@@ -103,8 +105,8 @@ angular.module('FileManagerApp').config(['fileManagerConfigProvider', function (
103105
},
104106
105107
allowedActions: angular.extend(defaults.allowedActions, {
106-
pickFiles: false,
107-
pickFolders: true,
108+
pickFiles: true,
109+
pickFolders: false,
108110
}),
109111
});
110112
}]);

dist/angular-filemanager.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/js/controllers/main.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,21 @@
123123
if (item.isFolder()) {
124124
return $scope.fileNavigator.folderClick(item);
125125
}
126+
126127
if (typeof $scope.config.pickCallback === 'function' && pick) {
127-
return $scope.config.pickCallback(item.model);
128+
var callbackSuccess = $scope.config.pickCallback(item.model);
129+
if (callbackSuccess === true) {
130+
return;
131+
}
128132
}
133+
129134
if (item.isImage()) {
130135
if ($scope.config.previewImagesInModal) {
131136
return $scope.openImagePreview(item);
132137
}
133138
return $scope.apiMiddleware.download(item, true);
134139
}
140+
135141
if (item.isEditable()) {
136142
return $scope.openEditItem(item);
137143
}

src/js/providers/translations.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
russian: 'Russian',
1818
ukrainian: 'Ukrainian',
1919
turkish: 'Turkish',
20+
persian: 'Persian',
2021
confirm: 'Confirm',
2122
cancel: 'Cancel',
2223
close: 'Close',
@@ -111,6 +112,7 @@
111112
russian: 'רוּסִי',
112113
ukrainian: 'אוקראיני',
113114
turkish: 'טורקי',
115+
persian: 'פַּרסִית',
114116
confirm: 'אשר',
115117
cancel: 'בטל',
116118
close: 'סגור',
@@ -204,6 +206,7 @@
204206
russian: 'Russo',
205207
ukrainian: 'Ucraniano',
206208
turkish: 'Turco',
209+
persian: 'Persa',
207210
confirm: 'Confirmar',
208211
cancel: 'Cancelar',
209212
close: 'Fechar',
@@ -298,6 +301,7 @@
298301
russian: 'Ruso',
299302
ukrainian: 'Ucraniano',
300303
turkish: 'Turco',
304+
persian: 'Persa',
301305
confirm: 'Confirmar',
302306
cancel: 'Cancelar',
303307
close: 'Cerrar',
@@ -392,6 +396,7 @@
392396
russian: 'Russe',
393397
ukrainian: 'Ukrainien',
394398
turkish: 'Turc',
399+
persian: 'Persan',
395400
confirm: 'Confirmer',
396401
cancel: 'Annuler',
397402
close: 'Fermer',
@@ -486,6 +491,7 @@
486491
russian: 'Russisch',
487492
ukrainian: 'Ukrainisch',
488493
turkish: 'Türkisch',
494+
persian: 'Persisch',
489495
confirm: 'Bestätigen',
490496
cancel: 'Abbrechen',
491497
close: 'Schließen',
@@ -580,6 +586,7 @@
580586
russian: 'Ruský',
581587
ukrainian: 'Ukrajinský',
582588
turkish: 'Turecký',
589+
persian: 'Perzský',
583590
confirm: 'Potvrdiť',
584591
cancel: 'Zrušiť',
585592
close: 'Zavrieť',
@@ -659,6 +666,7 @@
659666
new_folder: 'Nový priečinok',
660667
download_as_zip: 'Stiahnuť ako ZIP'
661668
});
669+
662670
$translateProvider.translations('zh', {
663671
filemanager: '文档管理器',
664672
language: '语言',
@@ -673,6 +681,7 @@
673681
russian: '俄語',
674682
ukrainian: '烏克蘭',
675683
turkish: '土耳其',
684+
persian: '波斯語',
676685
confirm: '确定',
677686
cancel: '取消',
678687
close: '关闭',
@@ -752,6 +761,7 @@
752761
new_folder: '新文件夹',
753762
download_as_zip: '下载的ZIP'
754763
});
764+
755765
$translateProvider.translations('ru', {
756766
filemanager: 'Файловый менеджер',
757767
language: 'Язык',
@@ -766,6 +776,7 @@
766776
russian: 'русский',
767777
ukrainian: 'украинец',
768778
turkish: 'турецкий',
779+
persian: 'персидский',
769780
confirm: 'Подьвердить',
770781
cancel: 'Отменить',
771782
close: 'Закрыть',
@@ -845,6 +856,7 @@
845856
new_folder: 'Новая папка',
846857
download_as_zip: 'Download as ZIP'
847858
});
859+
848860
$translateProvider.translations('ua', {
849861
filemanager: 'Файловий менеджер',
850862
language: 'Мова',
@@ -859,6 +871,7 @@
859871
russian: 'російський',
860872
ukrainian: 'український',
861873
turkish: 'турецька',
874+
persian: 'перський',
862875
confirm: 'Підтвердити',
863876
cancel: 'Відмінити',
864877
close: 'Закрити',
@@ -953,6 +966,7 @@
953966
russian: 'Rusça',
954967
ukrainian: 'Ukrayna',
955968
turkish: 'Türk',
969+
persian: 'Farsça',
956970
confirm: 'Onayla',
957971
cancel: 'İptal Et',
958972
close: 'Kapat',
@@ -1047,6 +1061,7 @@
10471061
russian: 'روسی',
10481062
ukrainian: 'اوکراینی',
10491063
turkish: 'ترکی',
1064+
persian: 'فارسی',
10501065
confirm: 'تایید',
10511066
cancel: 'رد',
10521067
close: 'بستن',

src/templates/navbar.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<li role="presentation"><a role="menuitem" tabindex="-1" href="" ng-click="changeLanguage('ru')">{{"russian" | translate}}</a></li>
3838
<li role="presentation"><a role="menuitem" tabindex="-1" href="" ng-click="changeLanguage('ua')">{{"ukrainian" | translate}}</a></li>
3939
<li role="presentation"><a role="menuitem" tabindex="-1" href="" ng-click="changeLanguage('tr')">{{"turkish" | translate}}</a></li>
40+
<li role="presentation"><a role="menuitem" tabindex="-1" href="" ng-click="changeLanguage('fa')">{{"persian" | translate}}</a></li>
4041
</ul>
4142

4243
<button class="btn btn-default btn-sm" ng-click="$parent.setTemplate('main-icons.html')" ng-show="$parent.viewTemplate !== 'main-icons.html'" title="{{'icons' | translate}}">

0 commit comments

Comments
 (0)