ascribe
/
wp-theme
mirror of https://github.com/ascribe/wp-theme
1
0
Fork 0
Code Issues Releases Wiki Activity

more cleanup, update to jQuery 2.2

This commit is contained in:
Matthias Kretschmann 2016-01-16 20:58:40 +01:00
parent 1fa765ba50
commit 3fc1aea957
14 changed files with 29 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
assets/js/ajax-pagination.js
View File

@ -1,12 +0,0 @@
/**
** ascribe v0.0.1
** The best WordPress theme ever made!
** http://ascribe.io
**
** Territorial <us@territorial.ca>
**
**
** https://github.com/ascribe/wp-theme.git
**/
$(document).ready(function(){$("#more-articles").click(function(a){a.preventDefault(),$.ajax({url:ajaxpagination.ajaxurl,type:"post",data:{action:"ajax_pagination"},success:function(a){alert(a)}})})});
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImFqYXgtcGFnaW5hdGlvbi5qcyJdLCJuYW1lcyI6WyIkIiwiZG9jdW1lbnQiLCJyZWFkeSIsImNsaWNrIiwiZSIsInByZXZlbnREZWZhdWx0IiwiYWpheCIsInVybCIsImFqYXhwYWdpbmF0aW9uIiwiYWpheHVybCIsInR5cGUiLCJkYXRhIiwiYWN0aW9uIiwic3VjY2VzcyIsInJlc3VsdCIsImFsZXJ0Il0sIm1hcHBpbmdzIjoiQUFBQUEsRUFBRUMsVUFBVUMsTUFBTSxXQUNkRixFQUFFLGtCQUFrQkcsTUFBTSxTQUFTQyxHQUMvQkEsRUFBRUMsaUJBQ0ZMLEVBQUVNLE1BQ0VDLElBQUtDLGVBQWVDLFFBQ3BCQyxLQUFNLE9BQ05DLE1BQ0lDLE9BQVEsbUJBRVpDLFFBQVMsU0FBVUMsR0FDZkMsTUFBT0QiLCJmaWxlIjoiYWpheC1wYWdpbmF0aW9uLmpzIiwic291cmNlc0NvbnRlbnQiOlsiJChkb2N1bWVudCkucmVhZHkoZnVuY3Rpb24oKXtcbiAgICAkKCcjbW9yZS1hcnRpY2xlcycpLmNsaWNrKGZ1bmN0aW9uKGUpe1xuICAgICAgICBlLnByZXZlbnREZWZhdWx0KCk7XG4gICAgICAgICQuYWpheCh7XG4gICAgICAgICAgICB1cmw6IGFqYXhwYWdpbmF0aW9uLmFqYXh1cmwsXG4gICAgICAgICAgICB0eXBlOiAncG9zdCcsXG4gICAgICAgICAgICBkYXRhOiB7XG4gICAgICAgICAgICAgICAgYWN0aW9uOiAnYWpheF9wYWdpbmF0aW9uJ1xuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIHN1Y2Nlc3M6IGZ1bmN0aW9uKCByZXN1bHQgKSB7XG4gICAgICAgICAgICAgICAgYWxlcnQoIHJlc3VsdCApO1xuICAgICAgICAgICAgfVxuICAgICAgICB9KVxuICAgIH0pO1xufSk7Il0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9

12
assets/js/ajax-pagination.min.js vendored
View File

@ -1,12 +0,0 @@
/**
** ascribe v0.0.1
** The best WordPress theme ever made!
** http://ascribe.io
**
** Territorial <us@territorial.ca>
**
**
** https://github.com/ascribe/wp-theme.git
**/
$(document).ready(function(){$("#more-articles").click(function(a){a.preventDefault(),$.ajax({url:ajaxpagination.ajaxurl,type:"post",data:{action:"ajax_pagination"},success:function(a){alert(a)}})})});
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImFqYXgtcGFnaW5hdGlvbi5qcyJdLCJuYW1lcyI6WyIkIiwiZG9jdW1lbnQiLCJyZWFkeSIsImNsaWNrIiwiZSIsInByZXZlbnREZWZhdWx0IiwiYWpheCIsInVybCIsImFqYXhwYWdpbmF0aW9uIiwiYWpheHVybCIsInR5cGUiLCJkYXRhIiwiYWN0aW9uIiwic3VjY2VzcyIsInJlc3VsdCIsImFsZXJ0Il0sIm1hcHBpbmdzIjoiQUFBQUEsRUFBRUMsVUFBVUMsTUFBTSxXQUNkRixFQUFFLGtCQUFrQkcsTUFBTSxTQUFTQyxHQUMvQkEsRUFBRUMsaUJBQ0ZMLEVBQUVNLE1BQ0VDLElBQUtDLGVBQWVDLFFBQ3BCQyxLQUFNLE9BQ05DLE1BQ0lDLE9BQVEsbUJBRVpDLFFBQVMsU0FBVUMsR0FDZkMsTUFBT0QiLCJmaWxlIjoiYWpheC1wYWdpbmF0aW9uLmpzIiwic291cmNlc0NvbnRlbnQiOlsiJChkb2N1bWVudCkucmVhZHkoZnVuY3Rpb24oKXtcbiAgICAkKCcjbW9yZS1hcnRpY2xlcycpLmNsaWNrKGZ1bmN0aW9uKGUpe1xuICAgICAgICBlLnByZXZlbnREZWZhdWx0KCk7XG4gICAgICAgICQuYWpheCh7XG4gICAgICAgICAgICB1cmw6IGFqYXhwYWdpbmF0aW9uLmFqYXh1cmwsXG4gICAgICAgICAgICB0eXBlOiAncG9zdCcsXG4gICAgICAgICAgICBkYXRhOiB7XG4gICAgICAgICAgICAgICAgYWN0aW9uOiAnYWpheF9wYWdpbmF0aW9uJ1xuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIHN1Y2Nlc3M6IGZ1bmN0aW9uKCByZXN1bHQgKSB7XG4gICAgICAgICAgICAgICAgYWxlcnQoIHJlc3VsdCApO1xuICAgICAgICAgICAgfVxuICAgICAgICB9KVxuICAgIH0pO1xufSk7Il0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9

15
assets/js/src/ajax-pagination.js
View File

@ -1,15 +0,0 @@
$(document).ready(function(){
$('#more-articles').click(function(e){
e.preventDefault();
$.ajax({
url: ajaxpagination.ajaxurl,
type: 'post',
data: {
action: 'ajax_pagination'
},
success: function( result ) {
alert( result );
}
})
});
});

52
assets/js/src/ascribe.js
View File

@ -1,6 +1,4 @@
//=include ajax-pagination.js
$(document).ready(function(){
slider();
@ -56,32 +54,28 @@ $(document).ready(function(){
});
}
function mobileNav() {
$('.hamburger').click(function(){
console.log('hi');
$('.mobile-nav').toggleClass('active');
});
}
function stickyNav() {
var didScroll = false;
var sticky = $('.sticky');
$(window).scroll(function () {
didScroll = true;
});
setInterval(function () {
if (didScroll) {
didScroll = false;
if ($(window).scrollTop() > 100) {
sticky.addClass('stuck');
}
else {
sticky.removeClass('stuck');
}
}
}, 250);
}
});
function stickyNav() {
var sticky = $('.sticky');
$(window).on('load resize scroll', function() {
if ( $(window).width() > 768 ) {
if ( $(window).scrollTop() > 100 ) {
sticky.addClass('stuck');
} else {
sticky.removeClass('stuck');
}
}
});
}
function mobileNav() {
$('.hamburger').click(function() {
$('.mobile-nav').toggleClass('active');
});
}

8
header.php
View File

@ -49,14 +49,6 @@ if ( is_category() || is_tag() ) {
<meta itemprop="description" content="<?php echo $description ?>">
<meta itemprop="image" content="<?php echo $shareimage; ?>">
<link rel="apple-touch-icon" sizes="57x57" href="<?php echo WPTHEME_TEMPLATE_URL; ?>/images/ico/apple-touch-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="<?php echo WPTHEME_TEMPLATE_URL; ?>/images/ico/apple-touch-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="<?php echo WPTHEME_TEMPLATE_URL; ?>/images/ico/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="<?php echo WPTHEME_TEMPLATE_URL; ?>/images/ico/apple-touch-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="<?php echo WPTHEME_TEMPLATE_URL; ?>/images/ico/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="<?php echo WPTHEME_TEMPLATE_URL; ?>/images/ico/apple-touch-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="<?php echo WPTHEME_TEMPLATE_URL; ?>/images/ico/apple-touch-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="<?php echo WPTHEME_TEMPLATE_URL; ?>/images/ico/apple-touch-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="<?php echo WPTHEME_TEMPLATE_URL; ?>/images/ico/apple-touch-icon-180x180.png">
<link rel="icon" type="image/png" href="<?php echo WPTHEME_TEMPLATE_URL; ?>/images/ico/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="<?php echo WPTHEME_TEMPLATE_URL; ?>/images/ico/favicon-194x194.png" sizes="194x194">

BIN
images/ico/apple-touch-icon-114x114.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
images/ico/apple-touch-icon-120x120.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
images/ico/apple-touch-icon-144x144.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.9 KiB

BIN
images/ico/apple-touch-icon-152x152.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.1 KiB

BIN
images/ico/apple-touch-icon-57x57.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
images/ico/apple-touch-icon-60x60.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
images/ico/apple-touch-icon-72x72.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
images/ico/apple-touch-icon-76x76.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

21
includes/functions/core.php
View File

@ -16,7 +16,6 @@ function setup() {
};
add_action( 'wp_enqueue_scripts', $n( 'scripts' ) );
add_action( 'wp_enqueue_scripts', $n( 'styles' ) );
}
@ -32,27 +31,19 @@ function setup() {
*/
function scripts( $debug = false ) {
wp_deregister_script('jquery');
wp_register_script('jquery', ("https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"), false, '1.3.2',true);
wp_enqueue_script('jquery');
if (!is_admin()) {
wp_deregister_script('jquery');
wp_register_script('jquery', 'https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js', false, '2.2.0', true);
wp_enqueue_script('jquery');
}
wp_enqueue_script(
'wptheme',
WPTHEME_TEMPLATE_URL . "/assets/js/ascribe.min.js",
array(),
array('jquery'),
WPTHEME_VERSION,
true
);
wp_enqueue_script(
'modernizr',
"https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js",
array(),
'2.8.3',
false
);
}
/**