pick files - can stop execution in callback + translations fix

marcoserafini2 · May 31, 2016 · d1ed31a · d1ed31a
1 parent 1753366
commit d1ed31a
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -13,10 +13,12 @@ This project is under free license. If you want to support the angular-filemanag
 ![](https://raw.githubusercontent.com/joni2back/angular-filemanager/master/screenshot.gif)
 
 ### Features
-  - Multilanguage (English / 简体中文 / Spanish / Portuguese / French / German / Slovak / Hebrew)
+  - Multilanguage (
+  English, Chinese, Spanish, Russian, Portuguese, French, German, Slovak, Hebrew, Persan, Ukrainian, Turkish)
   - Multiple templates (List / Icons)
   - Multiple file upload
   - Multiple file support
+  - Pick files callback for third parties apps
   - Search files
   - Directory tree navigation
   - Copy, Move, Rename (Interactive UX)
@@ -103,8 +105,8 @@ angular.module('FileManagerApp').config(['fileManagerConfigProvider', function (
     },
 
     allowedActions: angular.extend(defaults.allowedActions, {
-      pickFiles: false,
-      pickFolders: true,
+      pickFiles: true,
+      pickFolders: false,
     }),
   });
 }]);

diff --git a/dist/angular-filemanager.min.js b/dist/angular-filemanager.min.js
diff --git a/src/js/controllers/main.js b/src/js/controllers/main.js
@@ -123,15 +123,21 @@
             if (item.isFolder()) {
                 return $scope.fileNavigator.folderClick(item);
             }
+
             if (typeof $scope.config.pickCallback === 'function' && pick) {
-                return $scope.config.pickCallback(item.model);
+                var callbackSuccess = $scope.config.pickCallback(item.model);
+                if (callbackSuccess === true) {
+                    return;
+                }
             }
+
             if (item.isImage()) {
                 if ($scope.config.previewImagesInModal) {
                     return $scope.openImagePreview(item);
                 } 
                 return $scope.apiMiddleware.download(item, true);
             }
+
             if (item.isEditable()) {
                 return $scope.openEditItem(item);
             }

diff --git a/src/js/providers/translations.js b/src/js/providers/translations.js
@@ -17,6 +17,7 @@
             russian: 'Russian',
             ukrainian: 'Ukrainian',
             turkish: 'Turkish',
+            persian: 'Persian',
             confirm: 'Confirm',
             cancel: 'Cancel',
             close: 'Close',
@@ -111,6 +112,7 @@
             russian: 'רוּסִי',
             ukrainian: 'אוקראיני',
             turkish: 'טורקי',
+            persian: 'פַּרסִית',
             confirm: 'אשר',
             cancel: 'בטל',
             close: 'סגור',
@@ -204,6 +206,7 @@
             russian: 'Russo',
             ukrainian: 'Ucraniano',
             turkish: 'Turco',
+            persian: 'Persa',
             confirm: 'Confirmar',
             cancel: 'Cancelar',
             close: 'Fechar',
@@ -298,6 +301,7 @@
             russian: 'Ruso',
             ukrainian: 'Ucraniano',
             turkish: 'Turco',
+            persian: 'Persa',
             confirm: 'Confirmar',
             cancel: 'Cancelar',
             close: 'Cerrar',
@@ -392,6 +396,7 @@
             russian: 'Russe',
             ukrainian: 'Ukrainien',
             turkish: 'Turc',
+            persian: 'Persan',
             confirm: 'Confirmer',
             cancel: 'Annuler',
             close: 'Fermer',
@@ -486,6 +491,7 @@
             russian: 'Russisch',
             ukrainian: 'Ukrainisch',
             turkish: 'Türkisch',
+            persian: 'Persisch',
             confirm: 'Bestätigen',
             cancel: 'Abbrechen',
             close: 'Schließen',
@@ -580,6 +586,7 @@
             russian: 'Ruský',
             ukrainian: 'Ukrajinský',
             turkish: 'Turecký',
+            persian: 'Perzský',
             confirm: 'Potvrdiť',
             cancel: 'Zrušiť',
             close: 'Zavrieť',
@@ -659,6 +666,7 @@
             new_folder: 'Nový priečinok',
             download_as_zip: 'Stiahnuť ako ZIP'
         });
+
         $translateProvider.translations('zh', {
             filemanager: '文档管理器',
             language: '语言',
@@ -673,6 +681,7 @@
             russian: '俄語',
             ukrainian: '烏克蘭',
             turkish: '土耳其',
+            persian: '波斯語',
             confirm: '确定',
             cancel: '取消',
             close: '关闭',
@@ -752,6 +761,7 @@
             new_folder: '新文件夹',
             download_as_zip: '下载的ZIP'
         });
+
         $translateProvider.translations('ru', {
             filemanager: 'Файловый менеджер',
             language: 'Язык',
@@ -766,6 +776,7 @@
             russian: 'русский',
             ukrainian: 'украинец',
             turkish: 'турецкий',
+            persian: 'персидский',
             confirm: 'Подьвердить',
             cancel: 'Отменить',
             close: 'Закрыть',
@@ -845,6 +856,7 @@
             new_folder: 'Новая папка',
             download_as_zip: 'Download as ZIP'
         });
+
         $translateProvider.translations('ua', {
             filemanager: 'Файловий менеджер',
             language: 'Мова',
@@ -859,6 +871,7 @@
             russian: 'російський',
             ukrainian: 'український',
             turkish: 'турецька',
+            persian: 'перський',
             confirm: 'Підтвердити',
             cancel: 'Відмінити',
             close: 'Закрити',
@@ -953,6 +966,7 @@
             russian: 'Rusça',
             ukrainian: 'Ukrayna',
             turkish: 'Türk',
+            persian: 'Farsça',
             confirm: 'Onayla',
             cancel: 'İptal Et',
             close: 'Kapat',
@@ -1047,6 +1061,7 @@
             russian: 'روسی',
             ukrainian: 'اوکراینی',
             turkish: 'ترکی',
+            persian: 'فارسی',
             confirm: 'تایید',
             cancel: 'رد',
             close: 'بستن',

diff --git a/src/templates/navbar.html b/src/templates/navbar.html
@@ -37,6 +37,7 @@
           <li role="presentation"><a role="menuitem" tabindex="-1" href="" ng-click="changeLanguage('ru')">{{"russian" | translate}}</a></li>
           <li role="presentation"><a role="menuitem" tabindex="-1" href="" ng-click="changeLanguage('ua')">{{"ukrainian" | translate}}</a></li>
           <li role="presentation"><a role="menuitem" tabindex="-1" href="" ng-click="changeLanguage('tr')">{{"turkish" | translate}}</a></li>
+          <li role="presentation"><a role="menuitem" tabindex="-1" href="" ng-click="changeLanguage('fa')">{{"persian" | translate}}</a></li>
         </ul>
 
         <button class="btn btn-default btn-sm" ng-click="$parent.setTemplate('main-icons.html')" ng-show="$parent.viewTemplate !== 'main-icons.html'" title="{{'icons' | translate}}">