From 19fdbbdbcb59ac1cdf6a4c3236667d7752722707 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Mon, 27 Nov 2017 17:20:34 +0300 Subject: [PATCH] Increased version number Fixed: Sidenav helper causes issues on mobile media steps --- package-lock.json | 8 ++-- package.json | 2 +- .../fuse-mat-sidenav-helper.directive.ts | 39 ++++++------------- .../scss/partials/_angular-material-fix.scss | 36 ----------------- .../content/apps/chat/chat.component.html | 4 +- .../apps/contacts/contacts.component.html | 2 +- .../dashboards/project/project.component.html | 2 +- .../file-manager/file-manager.component.html | 2 +- .../content/apps/mail/mail.component.html | 2 +- .../content/apps/todo/todo.component.html | 2 +- .../left-sidenav-2-tabbed.component.html | 2 +- .../left-sidenav-2.component.html | 2 +- .../left-sidenav-tabbed.component.html | 2 +- .../left-sidenav/left-sidenav.component.html | 2 +- .../right-sidenav-2-tabbed.component.html | 2 +- .../right-sidenav-2.component.html | 2 +- .../right-sidenav-tabbed.component.html | 2 +- .../right-sidenav.component.html | 2 +- .../left-sidenav-2.component.html | 2 +- .../left-sidenav-3.component.html | 2 +- .../left-sidenav/left-sidenav.component.html | 2 +- .../right-sidenav-2.component.html | 2 +- .../right-sidenav-3.component.html | 2 +- .../right-sidenav.component.html | 2 +- 24 files changed, 38 insertions(+), 89 deletions(-) diff --git a/package-lock.json b/package-lock.json index f972c2e8..3e8772b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "fuse2", - "version": "1.2.2", + "version": "1.2.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -161,9 +161,9 @@ } }, "@angular/flex-layout": { - "version": "2.0.0-beta.10-4905443", - "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-2.0.0-beta.10-4905443.tgz", - "integrity": "sha512-jjr6mQ3X2vdEQbsyHD/mz1hfTBUUEOZVLFWEz/sbNoeU7uiA4lvqdp/ASrkZydGJHmTDUYrbBE/9kx0lherZ8Q==", + "version": "2.0.0-beta.10", + "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-2.0.0-beta.10.tgz", + "integrity": "sha512-Y4f+Gw8pjDBwb9IykSTGiYRfVyzLfzTxFvRzKuDYEGUFi2UG3zOmAr2OzkpA/+K4mE5zQ+hYkBJaJD+DXAd/6w==", "requires": { "tslib": "1.8.0" } diff --git a/package.json b/package.json index b65a7f31..85f9bd03 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fuse2", - "version": "1.2.2", + "version": "1.2.3", "license": "", "scripts": { "ng": "ng", diff --git a/src/app/core/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive.ts b/src/app/core/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive.ts index 334d66bc..4388c7bc 100644 --- a/src/app/core/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive.ts +++ b/src/app/core/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive.ts @@ -13,7 +13,6 @@ export class FuseMatSidenavHelperDirective implements OnInit, OnDestroy matchMediaSubscription: Subscription; @HostBinding('class.mat-is-locked-open') isLockedOpen = true; - @HostBinding('class.mat-stop-transition') stopTransition = true; @Input('fuseMatSidenavHelper') id: string; @Input('mat-is-locked-open') matIsLockedOpenBreakpoint: string; @@ -33,45 +32,31 @@ export class FuseMatSidenavHelperDirective implements OnInit, OnDestroy if ( this.observableMedia.isActive(this.matIsLockedOpenBreakpoint) ) { - setTimeout(() => { - this.isLockedOpen = true; - this.matSidenav.mode = 'side'; - this.matSidenav.open(); - }); - this.stopTransition = false; + this.isLockedOpen = true; + this.matSidenav.mode = 'side'; + this.matSidenav.toggle(true); } else { - setTimeout(() => { - this.isLockedOpen = false; - this.matSidenav.mode = 'over'; - this.matSidenav.close(); - }); - - setTimeout(() => { - this.stopTransition = false; - }, 3000); + this.isLockedOpen = false; + this.matSidenav.mode = 'over'; + this.matSidenav.toggle(false); } this.matchMediaSubscription = this.fuseMatchMedia.onMediaChange.subscribe(() => { if ( this.observableMedia.isActive(this.matIsLockedOpenBreakpoint) ) { - setTimeout(() => { - this.isLockedOpen = true; - this.matSidenav.mode = 'side'; - this.matSidenav.open(); - }); + this.isLockedOpen = true; + this.matSidenav.mode = 'side'; + this.matSidenav.toggle(true); } else { - setTimeout(() => { - this.isLockedOpen = false; - this.matSidenav.mode = 'over'; - this.matSidenav.close(); - }); + this.isLockedOpen = false; + this.matSidenav.mode = 'over'; + this.matSidenav.toggle(false); } }); - } ngOnDestroy() diff --git a/src/app/core/scss/partials/_angular-material-fix.scss b/src/app/core/scss/partials/_angular-material-fix.scss index b2905936..55d10a59 100644 --- a/src/app/core/scss/partials/_angular-material-fix.scss +++ b/src/app/core/scss/partials/_angular-material-fix.scss @@ -6,42 +6,6 @@ } } -// Fix: "Sidenav opening with animations for the first time" -mat-sidenav-container { - - mat-sidenav { - - &[mat-is-locked-open].mat-stop-transition { - transition: none !important; - transform: translate3d(0, 0, 0) !important; - opacity: 0; - - ~ .mat-sidenav-content, - ~ .mat-drawer-content { - transition: none !important; - } - } - - &.mat-sidenav-opened { - - &.mat-drawer-side { - - ~ .mat-sidenav-content, - ~ .mat-drawer-content { - transition: none !important; - transform: translate3d(0, 0, 0) !important; - } - } - } - - &.mat-drawer-end { - } - } - - .mat-drawer-content { - } -} - // Fix: "Inconsistent font sizes across elements" .mat-input-wrapper { font-size: 16px; diff --git a/src/app/main/content/apps/chat/chat.component.html b/src/app/main/content/apps/chat/chat.component.html index c3922d6b..c4256f34 100644 --- a/src/app/main/content/apps/chat/chat.component.html +++ b/src/app/main/content/apps/chat/chat.component.html @@ -13,7 +13,7 @@ - @@ -26,7 +26,7 @@ - diff --git a/src/app/main/content/apps/contacts/contacts.component.html b/src/app/main/content/apps/contacts/contacts.component.html index 3df02bd6..1e9ba451 100644 --- a/src/app/main/content/apps/contacts/contacts.component.html +++ b/src/app/main/content/apps/contacts/contacts.component.html @@ -42,7 +42,7 @@ - diff --git a/src/app/main/content/apps/dashboards/project/project.component.html b/src/app/main/content/apps/dashboards/project/project.component.html index de15be48..cd24acd8 100644 --- a/src/app/main/content/apps/dashboards/project/project.component.html +++ b/src/app/main/content/apps/dashboards/project/project.component.html @@ -688,7 +688,7 @@ - +
diff --git a/src/app/main/content/apps/file-manager/file-manager.component.html b/src/app/main/content/apps/file-manager/file-manager.component.html index 364f978d..8d7c09bf 100644 --- a/src/app/main/content/apps/file-manager/file-manager.component.html +++ b/src/app/main/content/apps/file-manager/file-manager.component.html @@ -69,7 +69,7 @@ - diff --git a/src/app/main/content/apps/mail/mail.component.html b/src/app/main/content/apps/mail/mail.component.html index e68bc7e2..fa68f0e6 100644 --- a/src/app/main/content/apps/mail/mail.component.html +++ b/src/app/main/content/apps/mail/mail.component.html @@ -7,7 +7,7 @@ - diff --git a/src/app/main/content/apps/todo/todo.component.html b/src/app/main/content/apps/todo/todo.component.html index 74af6f92..0d864ac7 100644 --- a/src/app/main/content/apps/todo/todo.component.html +++ b/src/app/main/content/apps/todo/todo.component.html @@ -7,7 +7,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.html index 035a4c02..0c11e93c 100644 --- a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.html +++ b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.html @@ -7,7 +7,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html index d7c773e7..58a074c0 100644 --- a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html +++ b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html @@ -7,7 +7,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.html index 56d5f3e2..943c86a3 100644 --- a/src/app/main/content/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.html +++ b/src/app/main/content/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.html @@ -7,7 +7,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html index bc2a40bb..6731ec41 100644 --- a/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html +++ b/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html @@ -7,7 +7,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.html index 30d01873..3b2d6fa7 100644 --- a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.html +++ b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.html @@ -126,7 +126,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html index 77eb288f..11c58da2 100644 --- a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html +++ b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html @@ -45,7 +45,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.html index c44b25c6..d557d0cf 100644 --- a/src/app/main/content/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.html +++ b/src/app/main/content/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.html @@ -126,7 +126,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html index 60de22d6..6d8bc416 100644 --- a/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html +++ b/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html @@ -45,7 +45,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html index e1bb81ab..c12cd085 100644 --- a/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html +++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html @@ -3,7 +3,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html index 61f81548..65e95140 100644 --- a/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html +++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html @@ -19,7 +19,7 @@ -
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html index 4fee2f7d..5f51c15f 100644 --- a/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html +++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html @@ -3,7 +3,7 @@ -
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html index 8b802fc8..c1da4750 100644 --- a/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html +++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html @@ -33,7 +33,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html index b8cb9aea..975c6a8d 100644 --- a/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html +++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html @@ -33,7 +33,7 @@ -
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html index 48ca7987..e7691363 100644 --- a/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html +++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html @@ -33,7 +33,7 @@ -