Updated jquery-ajax-loader.js and default templates

MacdonaldRobinson · Apr 18, 2019 · 6158256 · 6158256
1 parent a50ea5f
commit 6158256
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/WebApplication/App_Data/DB/FlexDotnetCMS.mdf b/WebApplication/App_Data/DB/FlexDotnetCMS.mdf
diff --git a/WebApplication/App_Data/DB/FlexDotnetCMS_log.ldf b/WebApplication/App_Data/DB/FlexDotnetCMS_log.ldf
diff --git a/WebApplication/Frontend/layouts/mediatype-layouts/home-mediatype.cshtml b/WebApplication/Frontend/layouts/mediatype-layouts/home-mediatype.cshtml
@@ -1,5 +1,6 @@
 <!-- Header -->
 {IncludeFile:'/Frontend/layouts/includes/header-home.cshtml'}
 
-
 {Field:MainContent}
+
+<Site:LoggedInHeader runat="server" />
diff --git a/WebApplication/Frontend/layouts/mediatype-layouts/page-mediatype.cshtml b/WebApplication/Frontend/layouts/mediatype-layouts/page-mediatype.cshtml
@@ -2,3 +2,5 @@
 {IncludeFile:'/Frontend/layouts/includes/header-interior.cshtml'}
 
 {Field:MainContent}
+
+<Site:LoggedInHeader runat="server" />
diff --git a/WebApplication/Frontend/layouts/template-layouts/home-page-template.cshtml b/WebApplication/Frontend/layouts/template-layouts/home-page-template.cshtml
@@ -14,8 +14,6 @@
 <body>
     {Settings:GlobalCodeInBody}
 
-    <Site:LoggedInHeader runat="server" />
-
 	<div id="DynamicContent">
 		<!-- PageContent -->
 		{PageContent}

diff --git a/WebApplication/Frontend/layouts/template-layouts/interior-page-template.cshtml b/WebApplication/Frontend/layouts/template-layouts/interior-page-template.cshtml
@@ -13,7 +13,6 @@
 
 <body>
     {Settings:GlobalCodeInBody}
-    <Site:LoggedInHeader runat="server" />
 
 	<div id="DynamicContent">
 		<!-- PageContent -->

diff --git a/WebApplication/Frontend/scripts/jquery-ajax-loader.js b/WebApplication/Frontend/scripts/jquery-ajax-loader.js
@@ -1,12 +1,11 @@
 var ajaxOptions = {
-	homePagePath: "/home/",
 	targetElement: "#DynamicContent",
 	preloadLinks: false,
-	animateIn: function (selector, html) {		
+	animateIn: function (selector, html) {
 		$(selector).each(function (index, el) {
 			//$(el).html(html);
 
-			$(el).toggle("fade", 250, function () {				
+			$(el).toggle("fade", 250, function () {
 				$(el).html(html);
 				//$(el).css("height", "100%");
 				// $("#mainNav").effect("fade");
@@ -44,6 +43,8 @@ function preloadLinks() {
 
 $(document).ready(function () {
 
+	trackPageView();
+
 	if (ajaxOptions.preloadLinks) {
 		preloadLinks();
 	}
@@ -126,11 +127,11 @@ function pushHistory(href, bodyHtml) {
 
 function _loadData(href, el, bodyHtml, callBackFunction) {
 
-	if ($("#DynamicContent").length > 0 && bodyHtml.indexOf("DynamicContent") != -1) {		
-		var doc = $('<output>').append($.parseHTML(bodyHtml, document, true));
-		var dynamicContent = doc.find("#DynamicContent").html();
+	var dynamicContent = bodyHtml;
 
-		bodyHtml = dynamicContent;
+	if ($("#DynamicContent").length > 0 && bodyHtml.indexOf("DynamicContent") != -1) {
+		var doc = $('<output>').append($.parseHTML(bodyHtml, document, true));
+		dynamicContent = doc.find("#DynamicContent").html();
 	}
 
 
@@ -141,7 +142,7 @@ function _loadData(href, el, bodyHtml, callBackFunction) {
 		updateTitle(href, bodyHtml);
 		pushHistory(href, bodyHtml);
 
-		loadeData($(el), bodyHtml);
+		loadeData($(el), dynamicContent);
 	}
 
 	if (el != "") {