Skip to content

Commit ce2416c

Browse files
joni2backjoni2back
committed
material spinner, unify angular directives
1 parent 3cbf5a7 commit ce2416c

19 files changed

+264
-136
lines changed

‎bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-filemanager",
3-
"version": "1.3.0",
3+
"version": "1.3.1",
44
"homepage": "https://github.com/joni2back/angular-filemanager",
55
"authors": [
66
"Jonas Sciangula Street <[email protected]>"

‎dist/angular-filemanager.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/angular-filemanager.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en" data-ng-app="FileManagerApp">
33
<head>
44
<!--
5-
* Angular FileManager v1.3.0 (https://github.com/joni2back/angular-filemanager)
5+
* Angular FileManager v1.3.1 (https://github.com/joni2back/angular-filemanager)
66
* Jonas Sciangula Street <[email protected]>
77
* Licensed under MIT (https://github.com/joni2back/angular-filemanager/blob/master/LICENSE)
88
-->

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-filemanager",
3-
"version": "1.3.0",
3+
"version": "1.3.1",
44
"description": "A very smart filemanager to manage your files in the browser.",
55
"main": "src/app.js",
66
"scripts": {

‎src/css/angular-filemanager.css

+123-8
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,11 @@ a:hover {
113113
}
114114

115115
@media (min-width: 768px) {
116+
.main {
117+
padding-right: 0;
118+
padding-left: 0;
119+
}
120+
116121
.sidebar {
117122
position: fixed;
118123
top: 50px;
@@ -123,7 +128,6 @@ a:hover {
123128
padding: 5px 0;
124129
overflow-x: hidden;
125130
overflow-y: auto;
126-
127131
background-color: #f5f5f5;
128132
border-right: 1px solid #eee;
129133
}
@@ -163,13 +167,6 @@ a:hover {
163167
padding: 0;
164168
}
165169

166-
@media (min-width: 768px) {
167-
.main {
168-
padding-right: 0;
169-
padding-left: 0;
170-
}
171-
}
172-
173170
.main .page-header {
174171
margin-top: 0;
175172
}
@@ -286,6 +283,11 @@ a:hover {
286283
animation-duration: .2s;
287284
}
288285

286+
.animated.slow {
287+
-webkit-animation-duration: 1.1s;
288+
animation-duration: 1.1s;
289+
}
290+
289291
@-webkit-keyframes fadeIn {
290292
0% {
291293
opacity: 0;
@@ -413,3 +415,116 @@ a:hover {
413415
.dropdown-menu.dropdown-right-click .divider {
414416
margin: 3px 0;
415417
}
418+
419+
.spinner-container {
420+
margin: 0 auto;
421+
text-align: center;
422+
margin-top: 8%;
423+
}
424+
425+
.spinner {
426+
width: 45px;
427+
height: 45px;
428+
-webkit-animation: rotator 1.4s linear infinite;
429+
animation: rotator 1.4s linear infinite;
430+
}
431+
432+
@-webkit-keyframes rotator {
433+
0% {
434+
-webkit-transform: rotate(0deg);
435+
transform: rotate(0deg);
436+
}
437+
100% {
438+
-webkit-transform: rotate(270deg);
439+
transform: rotate(270deg);
440+
}
441+
}
442+
443+
@keyframes rotator {
444+
0% {
445+
-webkit-transform: rotate(0deg);
446+
transform: rotate(0deg);
447+
}
448+
100% {
449+
-webkit-transform: rotate(270deg);
450+
transform: rotate(270deg);
451+
}
452+
}
453+
454+
.path {
455+
stroke-dasharray: 187;
456+
stroke-dashoffset: 0;
457+
-webkit-transform-origin: center;
458+
-ms-transform-origin: center;
459+
transform-origin: center;
460+
-webkit-animation: dash 1.4s ease-in-out infinite, colors 5.6s ease-in-out infinite;
461+
animation: dash 1.4s ease-in-out infinite, colors 5.6s ease-in-out infinite;
462+
}
463+
464+
@-webkit-keyframes colors {
465+
0% {
466+
stroke: #4285F4;
467+
}
468+
25% {
469+
stroke: #DE3E35;
470+
}
471+
50% {
472+
stroke: #F7C223;
473+
}
474+
75% {
475+
stroke: #1B9A59;
476+
}
477+
100% {
478+
stroke: #4285F4;
479+
}
480+
}
481+
482+
@keyframes colors {
483+
0% {
484+
stroke: #4285F4;
485+
}
486+
25% {
487+
stroke: #DE3E35;
488+
}
489+
50% {
490+
stroke: #F7C223;
491+
}
492+
75% {
493+
stroke: #1B9A59;
494+
}
495+
100% {
496+
stroke: #4285F4;
497+
}
498+
}
499+
500+
@-webkit-keyframes dash {
501+
0% {
502+
stroke-dashoffset: 187;
503+
}
504+
50% {
505+
stroke-dashoffset: 46.75;
506+
-webkit-transform: rotate(135deg);
507+
transform: rotate(135deg);
508+
}
509+
100% {
510+
stroke-dashoffset: 187;
511+
-webkit-transform: rotate(450deg);
512+
transform: rotate(450deg);
513+
}
514+
}
515+
516+
@keyframes dash {
517+
0% {
518+
stroke-dashoffset: 187;
519+
}
520+
50% {
521+
stroke-dashoffset: 46.75;
522+
-webkit-transform: rotate(135deg);
523+
transform: rotate(135deg);
524+
}
525+
100% {
526+
stroke-dashoffset: 187;
527+
-webkit-transform: rotate(450deg);
528+
transform: rotate(450deg);
529+
}
530+
}

‎src/js/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Angular FileManager v1.3.0 (https://github.com/joni2back/angular-filemanager)
2+
* Angular FileManager v1.3.1 (https://github.com/joni2back/angular-filemanager)
33
* Jonas Sciangula Street <[email protected]>
44
* Licensed under MIT (https://github.com/joni2back/angular-filemanager/blob/master/LICENSE)
55
*/

‎src/js/config.js

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
extractUrl: "bridges/php/handler.php",
2020
permissionsUrl: "bridges/php/handler.php",
2121

22+
sidebar: true,
23+
breadcrumb: true,
2224
allowedActions: {
2325
rename: true,
2426
copy: true,

‎src/js/controller.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
$scope.smartClick = function(item) {
3535
if (item.isFolder()) {
3636
return $scope.fileNavigator.folderClick(item);
37-
};
37+
}
3838
if (item.isImage()) {
3939
return item.preview();
4040
}

‎src/templates/current-folder-breadcrumb.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<ol class="breadcrumb mb0">
22
<li>
3-
<a href="" data-ng-click="fileNavigator.goTo(-1)">
3+
<a href="" ng-click="fileNavigator.goTo(-1)">
44
<i class="glyphicon glyphicon-folder-open mr2"></i>
55
</a>
66
</li>
7-
<li data-ng-repeat="(key, dir) in fileNavigator.currentPath track by key" data-ng-class="{'active':$last}" class="animated fast fadeIn">
8-
<a href="" data-ng-show="!$last" data-ng-click="fileNavigator.goTo(key)">
7+
<li ng-repeat="(key, dir) in fileNavigator.currentPath track by key" ng-class="{'active':$last}" class="animated fast fadeIn">
8+
<a href="" ng-show="!$last" ng-click="fileNavigator.goTo(key)">
99
<i class="glyphicon glyphicon-folder-open mr2"></i> {{dir}}
1010
</a>
11-
<span data-ng-show="$last"><i class="glyphicon glyphicon-folder-open mr2"></i> {{dir}}</span>
11+
<span ng-show="$last"><i class="glyphicon glyphicon-folder-open mr2"></i> {{dir}}</span>
1212
</li>
13-
<li><button class="btn btn-primary btn-xs" data-ng-click="fileNavigator.upDir()">&crarr;</button></li>
13+
<li><button class="btn btn-primary btn-xs" ng-click="fileNavigator.upDir()">&crarr;</button></li>
1414
</ol>

‎src/templates/index.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<div data-ng-controller="FileManagerCtrl">
1+
<div ng-controller="FileManagerCtrl">
22
<div ng-include="config.tplPath + '/navbar.html'"></div>
33

44
<div class="container-fluid">
55
<div class="row">
66

7-
<div class="col-sm-3 col-md-2 sidebar file-tree" ng-include="config.tplPath + '/sidebar.html'"></div>
8-
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
9-
<div ng-include="config.tplPath + '/current-folder-breadcrumb.html'"></div>
7+
<div class="col-sm-3 col-md-2 sidebar file-tree animated slow fadeIn" ng-include="config.tplPath + '/sidebar.html'" ng-show="config.sidebar && fileNavigator.history[0]"></div>
8+
<div class="main" ng-class="config.sidebar && fileNavigator.history[0] && 'col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2'">
9+
<div ng-include="config.tplPath + '/current-folder-breadcrumb.html'" ng-show="config.breadcrumb"></div>
1010
<div ng-include="config.tplPath + '/' + viewTemplate" class="main-navigation clearfix"></div>
1111
</div>
1212
</div>

0 commit comments

Comments
 (0)