diff --git a/VinFontApp/Views/Shared/_Layout.cshtml b/VinFontApp/Views/Shared/_Layout.cshtml
index af80a22..7c4208d 100644
--- a/VinFontApp/Views/Shared/_Layout.cshtml
+++ b/VinFontApp/Views/Shared/_Layout.cshtml
@@ -11,7 +11,7 @@
-
+
diff --git a/VinFontApp/wwwroot/js/js-page/asyncLayout.js b/VinFontApp/wwwroot/js/js-page/asyncLayout.js
index 28127bb..a06c6de 100644
--- a/VinFontApp/wwwroot/js/js-page/asyncLayout.js
+++ b/VinFontApp/wwwroot/js/js-page/asyncLayout.js
@@ -1,5 +1,4 @@
import AMenu from '/js/libs/js-AMenu.js'
-import AOverScroll from '/js/ext_libs/js-AOverScroll.js'
import ALayout from '/js/libs/js-ALayout.js'
var asyncStyleSheets = [
@@ -7,10 +6,11 @@ var asyncStyleSheets = [
'/css/atg-font/atg-admin-font.css'
];
window.app.loadCSS(asyncStyleSheets);
-window.isLoad_Menu = false;
class AsyncLayout extends ALayout {
constructor() {
+ super();
+ this.isLoaded = false;
this.layMNav = `
@@ -62,12 +62,22 @@ class AsyncLayout extends ALayout {
})
}
dispose() {
-
+ this.isLoaded = false;
+ var h = document.getElementById("header");
+ var f = document.getElementById("footer");
+ var h1 = document.getElementById("fHeader");
+ document.querySelector(".m-header").remove();
+ f.removeAll();
+ h.removeAll();
+ h1.remove();
+ window.app.removeSytemEventParent(window.app.lName);
+ window.app.removeCustomEventParent(window.app.lName);
+ super.dispose();
}
renderMenu() {
- window.isLoad_Menu = true;
+ this.isLoaded = true;
this._createFHeader();
- window.app.initNavs();
+ window.app.initNavs("Async");
var hHeader = document.getElementById("header").clientHeight;
var fHeader = document.getElementById("fHeader");
@@ -83,10 +93,11 @@ class AsyncLayout extends ALayout {
fHeader.classList.remove("show");
}
});
- this.addCustomEvent(idE0, window.app, "Asyc");
+ this.addCustomEvent(idE0, window.app, "Async");
var a1 = new AMenu("#header .nav-mainmenu", ".m-header", document.querySelectorAll(".m-navbar > .ico-menu"), true);
-
+ this.listAObject.add(a1);
var a2 = new AMenu("#fHeader .nav-mainmenu", null, null);
+ this.listAObject.add(a2);
const idE1 = window.app.on("redirect_page", (e) => {
a1.changeActive();
a2.changeActive();
@@ -96,25 +107,9 @@ class AsyncLayout extends ALayout {
window.app.initNavApp(window.GetAbsoluteURL("/Search"));
}
const btnMHeader = document.getElementById("btnMHeader");
- btnMHeader.addEventListener(this.eventName, f);
- this.addSystemEvent(this.eventName, f, )
- }
- hideMenu() {
- var h = document.getElementById("header");
- var f = document.getElementById("footer");
- var h1 = document.getElementById("fHeader");
- h.classList.add("d-n");
- f.classList.add("d-n");
- h1.classList.add("d-n");
- }
- showMenu() {
- var h = document.getElementById("header");
- var f = document.getElementById("footer");
- var h1 = document.getElementById("fHeader");
- h.classList.remove("d-n");
- f.classList.remove("d-n");
- h1.classList.remove("d-n");
+ // btnMHeader.addEventListener(this.eventName, f);
+ this.addSystemEvent(this.eventName, btnMHeader, f);
}
}
-
+window.ALayout.set("Async", new AsyncLayout());
window.AScript.set("asyncLayout", true);
\ No newline at end of file
diff --git a/VinFontApp/wwwroot/js/js-page/asyncLayout1.js b/VinFontApp/wwwroot/js/js-page/asyncLayout1.js
index 8d52025..fb24dc7 100644
--- a/VinFontApp/wwwroot/js/js-page/asyncLayout1.js
+++ b/VinFontApp/wwwroot/js/js-page/asyncLayout1.js
@@ -1,13 +1,29 @@
import AMenu from '/js/libs/js-AMenu.js'
-import AOverScroll from '/js/ext_libs/js-AOverScroll.js'
+import ALayout from '/js/libs/js-ALayout.js'
+
var asyncStyleSheets = [
'https://fonts.googleapis.com/css2?family=Quicksand:wght@300;400;500;600;700&display=swap',
'/css/atg-font/atg-admin-font.css'
];
window.app.loadCSS(asyncStyleSheets);
-window.isLoad_Menu = false;
-const layMNav = `