Merge branch 'nicolasacquaviva-master'

joni2back · joni2back · commit b82728e3d427 · 2017-10-17T14:23:30.000-03:00
diff --git a/dist/angular-filemanager.min.js b/dist/angular-filemanager.min.js
diff --git a/index.html b/index.html
@@ -11,10 +11,10 @@
   <title>angular-filemanager</title>
 
   <!-- third party -->
+    <script src="bower_components/jquery/dist/jquery.min.js"></script>
     <script src="bower_components/angular/angular.min.js"></script>
     <script src="bower_components/angular-translate/angular-translate.min.js"></script>
     <script src="bower_components/ng-file-upload/ng-file-upload.min.js"></script>
-    <script src="bower_components/jquery/dist/jquery.min.js"></script>
     <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
     <link rel="stylesheet" href="bower_components/bootswatch/paper/bootstrap.min.css" />
   <!-- /third party -->
@@ -41,7 +41,7 @@
     <link href="dist/angular-filemanager.min.css" rel="stylesheet">
     <script src="dist/angular-filemanager.min.js"></script>
   <!-- /Comment if you need to use raw source code -->
-  
+
   <script type="text/javascript">
     //example to override angular-filemanager default config
     angular.module('FileManagerApp').config(['fileManagerConfigProvider', function (config) {
@@ -67,7 +67,7 @@
 <body class="ng-cloak">
   <angular-filemanager></angular-filemanager>
 
-  <script> 
+  <script>
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
diff --git a/src/js/app.js b/src/js/app.js
@@ -1,22 +1,22 @@
-(function(window, angular, $) {
+(function(window, angular) {
     'use strict';
     angular.module('FileManagerApp', ['pascalprecht.translate', 'ngFileUpload']);
 
     /**
      * jQuery inits
      */
-    $(window.document).on('shown.bs.modal', '.modal', function() {
+    angular.element(window.document).on('shown.bs.modal', '.modal', function() {
         window.setTimeout(function() {
-            $('[autofocus]', this).focus();
+            angular.element('[autofocus]', this).focus();
         }.bind(this), 100);
     });
 
-    $(window.document).on('click', function() {
-        $('#context-menu').hide();
+    angular.element(window.document).on('click', function() {
+        angular.element('#context-menu').hide();
     });
 
-    $(window.document).on('contextmenu', '.main-navigation .table-files tr.item-list:has("td"), .item-list', function(e) {
-        var menu = $('#context-menu');
+    angular.element(window.document).on('contextmenu', '.main-navigation .table-files tr.item-list:has("td"), .item-list', function(e) {
+        var menu = angular.element('#context-menu');
 
         if (e.pageX >= window.innerWidth - menu.width()) {
             e.pageX -= menu.width();
@@ -54,5 +54,5 @@
             return undefined;
         };
     }
- 
-})(window, angular, jQuery);
+
+})(window, angular);
diff --git a/src/js/controllers/main.js b/src/js/controllers/main.js
@@ -1,4 +1,4 @@
-(function(angular, $) {
+(function(angular) {
     'use strict';
     angular.module('FileManagerApp').controller('FileManagerCtrl', [
         '$scope', '$rootScope', '$window', '$translate', 'fileManagerConfig', 'item', 'fileNavigator', 'apiMiddleware',
@@ -165,7 +165,7 @@
         };
 
         $scope.modal = function(id, hide, returnElement) {
-            var element = $('#' + id);
+            var element = angular.element('#' + id);
             element.modal(hide ? 'hide' : 'show');
             $scope.apiMiddleware.apiHandler.error = '';
             $scope.apiMiddleware.apiHandler.asyncSuccess = false;
@@ -362,4 +362,4 @@
         $scope.fileNavigator.refresh();
 
     }]);
-})(angular, jQuery);
+})(angular);
diff --git a/src/js/services/apihandler.js b/src/js/services/apihandler.js
@@ -1,7 +1,7 @@
-(function(angular, $) {
+(function(angular) {
     'use strict';
-    angular.module('FileManagerApp').service('apiHandler', ['$http', '$q', '$window', '$translate', 'Upload',
-        function ($http, $q, $window, $translate, Upload) {
+    angular.module('FileManagerApp').service('apiHandler', ['$http', '$q', '$window', '$translate', '$httpParamSerializer', 'Upload',
+        function ($http, $q, $window, $translate, $httpParamSerializer, Upload) {
 
         $http.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
 
@@ -222,7 +222,7 @@
                 action: 'download',
                 path: path
             };
-            return path && [apiUrl, $.param(data)].join('?');
+            return path && [apiUrl, $httpParamSerializer(data)].join('?');
         };
 
         ApiHandler.prototype.download = function(apiUrl, itemPath, toFilename, downloadByAjax, forceNewWindow) {
@@ -256,7 +256,7 @@
                 items: items,
                 toFilename: toFilename
             };
-            var url = [apiUrl, $.param(data)].join('?');
+            var url = [apiUrl, $httpParamSerializer(data)].join('?');
 
             if (!downloadByAjax || forceNewWindow || !$window.saveAs) {
                 !$window.saveAs && $window.console.log('Your browser dont support ajax download, downloading by default');
@@ -367,4 +367,4 @@
         return ApiHandler;
 
     }]);
-})(angular, jQuery);
+})(angular);
