Merge pull request #10 from tparnell8/aspnet46

analytics
This commit is contained in:
Tommy Parnell
2015-10-19 19:07:47 -04:00
3 changed files with 35 additions and 30 deletions

View File

@@ -30,33 +30,5 @@
}
@section scripts{
<script type="text/javascript">
$(document).ready(function(){
var page = @Model.CurrentPage;
$('img').addClass('img-responsive');
$('.tile').addClass('show');
var loading = false;
$(window).on('scroll', function () {
var loadingImage = $('.loadWheel');
if($(window).scrollTop() + $(window).height() == $(document).height() && !loading ) {
loading = true
loadingImage.show();
$.ajax('/Home/Tiles', {data:{page:page+1}})
.done(function(data){
page++;
loading = false;
loadingImage.hide();
var resd = $(data);
resd.find('img').addClass('img-responsive');
$('#tilesContainer').append(resd).find('.tile').addClass('show');
})
.error(function(){
loadingImage.hide();
});
}
});
});
</script>
<script src="~/js/site.js" asp-append-version="true"></script>
}

View File

@@ -47,7 +47,6 @@
asp-fallback-test="_">
</script>
<script src="~/js/site.js" asp-append-version="true"></script>
@RenderSection("scripts", required: false)
</body>
</html>

View File

@@ -1 +1,35 @@
// Write your Javascript code.
$(document).ready(function(){
var page = @Model.CurrentPage;
$('img').addClass('img-responsive');
$('.tile').addClass('show');
var loading = false;
$(window).on('scroll', function () {
var loadingImage = $('.loadWheel');
if($(window).scrollTop() + $(window).height() == $(document).height() && !loading ) {
loading = true
loadingImage.show();
$.ajax('/Home/Tiles', {data:{page:page+1}})
.done(function(data){
page++;
loading = false;
loadingImage.hide();
var resd = $(data);
resd.find('img').addClass('img-responsive');
$('#tilesContainer').append(resd).find('.tile').addClass('show');
})
.error(function(){
loadingImage.hide();
});
}
});
});
(function (i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
(i[r].q = i[r].q || []).push(arguments)
}, i[r].l = 1 * new Date(); a = s.createElement(o),
m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
ga('create', 'UA-48128396-3', 'auto');
ga('send', 'pageview');