Merge branch 'furqanaziz-upgrade-versions'

Author: joni2back

bower.json

@@ -22,11 +22,11 @@
     "tests"
   ],
   "dependencies": {
-    "angular": "~1.5.0",
-    "angular-translate": "~2.9.1",
+    "angular": "~1.6.4",
+    "angular-translate": "~2.15.1",
     "bootstrap": "~3.3.2",
-    "jquery": "~2.2.0",
-    "bootswatch": "3.3.6+1",
+    "jquery": "~3.1.1",
+    "bootswatch": "~3.3.7",
     "ng-file-upload": "^12.0.1"
   }
 }

bower_components/angular-translate/angular-translate.min.js

@@ -7,7 +7,7 @@
         var $storage = $window.localStorage;
         $scope.config = fileManagerConfig;
         $scope.reverse = false;
-        $scope.predicate = ['model.type', 'model.name'];        
+        $scope.predicate = ['model.type', 'model.name'];
         $scope.order = function(predicate) {
             $scope.reverse = ($scope.predicate[1] === predicate) ? !$scope.reverse : false;
             $scope.predicate[1] = predicate;
@@ -134,10 +134,10 @@
             if (item.isImage()) {
                 if ($scope.config.previewImagesInModal) {
                     return $scope.openImagePreview(item);
-                } 
+                }
                 return $scope.apiMiddleware.download(item, true);
             }
-            
+
             if (item.isEditable()) {
                 return $scope.openEditItem(item);
             }
@@ -148,7 +148,7 @@
             $scope.apiMiddleware.apiHandler.inprocess = true;
             $scope.modal('imagepreview', null, true)
                 .find('#imagepreview-target')
-                .attr('src', $scope.apiMiddleware.getUrl(item))
+                .attr('src', $scope.getUrl(item))
                 .unbind('load error')
                 .on('load error', function() {
                     $scope.apiMiddleware.apiHandler.inprocess = false;
@@ -282,7 +282,7 @@
             });
         };
 
-        $scope.move = function() {           
+        $scope.move = function() {
             var anyItem = $scope.singleSelection() || $scope.temps[0];
             if (anyItem && validateSamePath(anyItem)) {
                 $scope.apiMiddleware.apiHandler.error = $translate.instant('error_cannot_move_same_path');
@@ -340,6 +340,10 @@
             });
         };
 
+        $scope.getUrl = function(_item) {
+            return $scope.apiMiddleware.getUrl(_item);
+        };
+
         var validateSamePath = function(item) {
             var selectedPath = $rootScope.selectedModalPath.join('');
             var selectedItemsPath = item && item.model.path.join('');