Skip to content

Cookies 2 storage #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 20, 2016
Merged

Cookies 2 storage #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e88fffb
using localStorage instead cookies
joni2back Feb 20, 2016
70af917
using localStorage instead cookies
joni2back Feb 20, 2016
1d61f7f
upgrading version
joni2back Feb 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
3 changes: 1 addition & 2 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>"
Expand All @@ -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"
Expand Down
9 changes: 0 additions & 9 deletions bower_components/angular-cookies/angular-cookies.min.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion dist/angular-filemanager.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
-->
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions src/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 8 additions & 6 deletions src/js/controllers/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
(function(window, angular, $) {
'use strict';
angular.module('FileManagerApp').controller('FileManagerCtrl', [
'$scope', '$translate', '$cookies', 'fileManagerConfig', 'item', 'fileNavigator', 'fileUploader',
function($scope, $translate, $cookies, fileManagerConfig, Item, FileNavigator, FileUploader) {
'$scope', '$translate', 'fileManagerConfig', 'item', 'fileNavigator', 'fileUploader',
function($scope, $translate, fileManagerConfig, Item, FileNavigator, FileUploader) {

var $storage = window.localStorage;

$scope.config = fileManagerConfig;
$scope.reverse = false;
Expand All @@ -17,19 +19,19 @@
$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.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) {
Expand Down