Merge branch 'master' into click-changes

joni2back · joni2back · commit d69c06526f2f · 2016-02-20T19:24:49.000-03:00
diff --git a/README.md b/README.md
@@ -45,7 +45,6 @@ A very smart filemanager to manage your files in the browser developed in Angula
 <!-- third party -->
   <script src="bower_components/angular/angular.min.js"></script>
   <script src="bower_components/angular-translate/angular-translate.min.js"></script>
-  <script src="bower_components/angular-cookies/angular-cookies.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" />
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-filemanager",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "homepage": "https://github.com/joni2back/angular-filemanager",
   "authors": [
     "Jonas Sciangula Street <joni2back@gmail.com>"
@@ -21,7 +21,6 @@
   "dependencies": {
     "angular": "~1.5.0",
     "angular-translate": "~2.9.1",
-    "angular-cookies": "~1.5.0",
     "bootstrap": "~3.3.2",
     "jquery": "~2.2.0",
     "bootswatch": "3.3.6+1"
diff --git a/bower_components/angular-cookies/angular-cookies.min.js b/bower_components/angular-cookies/angular-cookies.min.js
diff --git a/dist/angular-filemanager.min.js b/dist/angular-filemanager.min.js
diff --git a/index.html b/index.html
@@ -2,7 +2,7 @@
 <html lang="en" data-ng-app="FileManagerApp">
 <head>
   <!--
-    * Angular FileManager v1.4.7 (https://github.com/joni2back/angular-filemanager)
+    * Angular FileManager v1.4.8 (https://github.com/joni2back/angular-filemanager)
     * Jonas Sciangula Street <joni2back@gmail.com>
     * Licensed under MIT (https://github.com/joni2back/angular-filemanager/blob/master/LICENSE)
   -->
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-filemanager",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "description": "A very smart filemanager to manage your files in the browser.",
   "main": "src/app.js",
   "scripts": {
diff --git a/src/js/app.js b/src/js/app.js
@@ -1,12 +1,12 @@
 /*!
- * Angular FileManager v1.4.7 (https://github.com/joni2back/angular-filemanager)
+ * Angular FileManager v1.4.8 (https://github.com/joni2back/angular-filemanager)
  * Jonas Sciangula Street <joni2back@gmail.com>
  * Licensed under MIT (https://github.com/joni2back/angular-filemanager/blob/master/LICENSE)
  */
 
 (function(window, angular, $) {
     'use strict';
-    angular.module('FileManagerApp', ['pascalprecht.translate', 'ngCookies']);
+    angular.module('FileManagerApp', ['pascalprecht.translate']);
 
     /**
      * jQuery inits
diff --git a/src/js/controllers/main.js b/src/js/controllers/main.js
@@ -1,8 +1,10 @@
 (function(window, angular, $) {
     'use strict';
     angular.module('FileManagerApp').controller('FileManagerCtrl', [
-        '$scope', '$rootScope', '$translate', '$cookies', 'fileManagerConfig', 'item', 'fileNavigator', 'fileUploader', 'apiHandler',
-        function($scope, $rootScope, $translate, $cookies, fileManagerConfig, Item, FileNavigator, FileUploader, ApiHandler) {
+        '$scope', '$rootScope', '$translate', 'fileManagerConfig', 'item', 'fileNavigator', 'fileUploader', 'apiHandler',
+        function($scope, $rootScope, $translate, fileManagerConfig, Item, FileNavigator, FileUploader, ApiHandler) {
+
+        var $storage = window.localStorage;
 
         $scope.config = fileManagerConfig;
         $scope.reverse = false;
@@ -11,13 +13,12 @@
             $scope.reverse = ($scope.predicate[1] === predicate) ? !$scope.reverse : false;
             $scope.predicate[1] = predicate;
         };
-window.scope=$scope;
         $scope.query = '';
         $scope.temp = new Item();
         $scope.fileNavigator = new FileNavigator();
         $scope.fileUploader = FileUploader;
         $scope.uploadFileList = [];
-        $scope.viewTemplate = $cookies.get('viewTemplate') || 'main-table.html';
+        $scope.viewTemplate = $storage.getItem('viewTemplate') || 'main-table.html';
         $scope.temps = [];
         $rootScope.selectorModalPath = [];
 
@@ -26,16 +27,16 @@ window.scope=$scope;
         };
 
         $scope.setTemplate = function(name) {
-            $cookies.put('viewTemplate', name);
+            $storage.setItem('viewTemplate', name);
             $scope.viewTemplate = name;
         };
 
         $scope.changeLanguage = function (locale) {
             if (locale) {
-                $cookies.put('language', locale);
+                $storage.setItem('language', locale);
                 return $translate.use(locale);
             }
-            $translate.use($cookies.get('language') || fileManagerConfig.defaultLang);
+            $translate.use($storage.getItem('language') || fileManagerConfig.defaultLang);
         };
 
         $scope.touch = function(item) {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angular-filemanager",`
`3`		`- "version": "1.4.7",`
	`3`	`+ "version": "1.4.8",`
`4`	`4`	`"description": "A very smart filemanager to manage your files in the browser.",`
`5`	`5`	`"main": "src/app.js",`
`6`	`6`	`"scripts": {`