Merge pull request #123 from INN/121-cachebusters

Cachebust :allthethings:
INN · Nov 14, 2019 · 1c2dbaa · 1c2dbaa
2 parents d67bfeb + 026d1d7
commit 1c2dbaa
Show file tree

Hide file tree

Showing 4 changed files with 112 additions and 68 deletions.
diff --git a/wp-content/themes/citylimits/functions.php b/wp-content/themes/citylimits/functions.php
@@ -306,16 +306,6 @@ function zonein_tax_archive_query( $query ) {
 }
 add_action( 'pre_get_posts', 'zonein_tax_archive_query', 1 );
 
-/**
- * get other scripts
- */
-function citylimits_communitywire_enqueue() {
- 	if (is_page_template( 'page-communitywire.php' )) {
-		wp_enqueue_script( 'inn-tools', get_stylesheet_directory_uri() . '/js/communitywire.js', array( 'jquery' ), '1.1', true );
-	}
-}
-add_action( 'wp_enqueue_scripts', 'citylimits_communitywire_enqueue' );
-
 /* need this to allow Gravity Forms to post to API */
 add_filter( 'gform_webhooks_request_args', function ( $request_args, $feed ) {
     $request_url = rgars( $feed, 'meta/requestURL' );
@@ -335,16 +325,6 @@ function set_max_srcset_image_width( $max_width ) {
 }
 add_filter( 'max_srcset_image_width', 'set_max_srcset_image_width' );
 
-/**
- * newsletter subscribe forms
- */
-function citylimits_newsletter_enqueue() {
-	wp_register_script( 'jscookies', get_stylesheet_directory_uri() . '/js/cookies.js', null, '1.1', true );
-	wp_register_script( 'cl-newsletter', get_stylesheet_directory_uri() . '/js/newsletter.js', array( 'jquery', 'jscookies' ), null, true );
-	wp_localize_script( 'cl-newsletter', 'myAjax', array( 'ajaxurl' => admin_url( 'admin-ajax.php' )));
-}
-add_action( 'wp_enqueue_scripts', 'citylimits_newsletter_enqueue' );
-
 function citylimits_newsletter_form_interstitial() {
 	get_template_part( 'partials/newsletter-signup', 'maincolumn' );
 }
@@ -381,23 +361,6 @@ function register_citylimits_menu_locations() {
 }
 add_action( 'init', 'register_citylimits_menu_locations' );
 
-/**
- * Enqueue specific styles and scripts for City Limits child theme
- */
-function citylimits_enqueue_styles(){
-	wp_enqueue_style( 'dashicons' );
-	wp_enqueue_script( 'citylimits-navigation', get_stylesheet_directory_uri() . '/js/navigation.js', array( 'jquery', 'largo-modernizr' ), '1.0', true );
-}
-add_action( 'wp_enqueue_scripts', 'citylimits_enqueue_styles' );
-
-/**
- * Dequeue specific scripts
- */
-function citylimits_dequeue_scripts(){
-	wp_dequeue_script( 'largo-navigation' );
-}
-add_action( 'wp_print_scripts', 'citylimits_dequeue_scripts', 100 );
-
 /**
  * Function to add thumbnail images to the secondary special project nav menu
  * 

diff --git a/wp-content/themes/citylimits/inc/enqueue.php b/wp-content/themes/citylimits/inc/enqueue.php
@@ -45,25 +45,6 @@ function largo_enqueue_js() {
 			$version
 		);
 
-		wp_enqueue_style(
-			'largo-stylesheet',
-			get_template_directory_uri() . '/css/style' . $suffix . '.css',
-			null,
-			$version
-		);
-
-		wp_enqueue_style(
-			'typekit',
-			'https://use.typekit.net/xkz6lbv.css'
-		);
-
-		wp_enqueue_style(
-			'largo-child-styles',
-			get_stylesheet_directory_uri() . '/css/child-style.css',
-			array( 'largo-stylesheet', 'typekit' ),
-			filemtime( get_stylesheet_directory() . '/css/child-style.css' )
-		);
-
 		// Core JS includes some utilities, initializes carousels, search form behavior,
 		// popovers, responsive header image, etc.
 		wp_enqueue_script(
@@ -117,6 +98,80 @@ function largo_enqueue_js() {
 		);
 	}
 
+/**
+ * Enqueue specific styles and scripts for City Limits child theme
+ */
+function citylimits_enqueue_styles(){
+	wp_enqueue_style(
+		'typekit',
+		'https://use.typekit.net/xkz6lbv.css'
+	);
+
+	wp_enqueue_style(
+		'largo-child-styles',
+		get_stylesheet_directory_uri() . '/css/child-style.css',
+		array( 'largo-stylesheet', 'typekit' ),
+		filemtime( get_stylesheet_directory() . '/css/child-style.css' )
+	);
+
+	wp_enqueue_style( 'dashicons' );
+	wp_enqueue_script(
+		'citylimits-navigation',
+		get_stylesheet_directory_uri() . '/js/navigation.js',
+		array( 'jquery', 'largo-modernizr' ),
+		filemtime( get_stylesheet_directory() . '/js/navigation.js' ),
+		true
+	);
+}
+add_action( 'wp_enqueue_scripts', 'citylimits_enqueue_styles' );
+
+/**
+ * Dequeue specific scripts
+ */
+function citylimits_dequeue_scripts(){
+	wp_dequeue_script( 'largo-navigation' );
+}
+add_action( 'wp_print_scripts', 'citylimits_dequeue_scripts', 100 );
+
+function citylimits_communitywire_enqueue() {
+ 	if (is_page_template( 'page-communitywire.php' )) {
+		wp_enqueue_script(
+			'inn-tools',
+			get_stylesheet_directory_uri() . '/js/communitywire.js',
+			array( 'jquery' ),
+			filemtime( get_stylesheet_directory() . '/js/communitywire.js' ),
+			true
+		);
+	}
+}
+add_action( 'wp_enqueue_scripts', 'citylimits_communitywire_enqueue' );
+
+/**
+ * newsletter subscribe forms
+ */
+function citylimits_newsletter_enqueue() {
+	wp_register_script(
+		'jscookies',
+		get_stylesheet_directory_uri() . '/js/cookies.js',
+		null,
+		filemtime( get_stylesheet_directory() . '/js/cookies.js' ),
+		true
+	);
+	wp_register_script(
+		'cl-newsletter',
+		get_stylesheet_directory_uri() . '/js/newsletter.js',
+		array( 'jquery', 'jscookies' ),
+		filemtime( get_stylesheet_directory() . '/js/newsletter.js' ),
+		true
+	);
+	wp_localize_script(
+		'cl-newsletter',
+		'myAjax',
+		array( 'ajaxurl' => admin_url( 'admin-ajax.php' ) )
+	);
+}
+add_action( 'wp_enqueue_scripts', 'citylimits_newsletter_enqueue' );
+
 /**
  * ADD Google Tag Manager Verification code TO HEADER
  */

diff --git a/wp-content/themes/citylimits/inc/job-board.php b/wp-content/themes/citylimits/inc/job-board.php
@@ -9,7 +9,13 @@
  * Enqueue custom sidebar styles
  */
 function largo_jobboard_enqueue() {
-	wp_enqueue_style('job-board-styles', get_stylesheet_directory_uri() . '/css/job-board.css', false, '20170609', 'screen');
+	wp_enqueue_style(
+		'job-board-styles',
+		get_stylesheet_directory_uri() . '/css/job-board.css',
+		false,
+		filemtime( get_stylesheet_directory() . '/css/job-board.css' ),
+		'screen'
+	);
 }
 add_action('wp_enqueue_scripts', 'largo_jobboard_enqueue' );
 

diff --git a/wp-content/themes/citylimits/inc/metaboxes.php b/wp-content/themes/citylimits/inc/metaboxes.php
@@ -127,27 +127,47 @@ public function save_post( $post_id ) {
 	public function enqueue_datepicker() {
 		wp_enqueue_script( 'jquery-ui-datepicker' );
 		wp_enqueue_script( 'jquery-ui-slider' );
-		wp_enqueue_script( 'jquery-timepicker', get_stylesheet_directory_uri().'/js/jquery-ui-timepicker-addon.js', array( 'jquery', 'jquery-ui-datepicker', 'jquery-ui-slider' ) );
+		wp_enqueue_script(
+			'jquery-timepicker',
+			get_stylesheet_directory_uri().'/js/jquery-ui-timepicker-addon.js',
+			array( 'jquery', 'jquery-ui-datepicker', 'jquery-ui-slider' ),
+			filemtime( get_stylesheet_directory().'/js/jquery-ui-timepicker-addon.js' )
+		);
 	}
 
 	public function initialize_datepicker() {
 		$current_screen = get_current_screen();
 		if ( in_array( $current_screen->id, $this->screens ) ) { 
-			wp_register_style( 'jquery-ui-smoothness', get_stylesheet_directory_uri().'/css/jquery-ui-smoothness' . $suffix . '.css' );
-			wp_register_style( 'jquery-ui-datepicker', get_stylesheet_directory_uri().'/css/datepicker' . $suffix . '.css' );
-			wp_register_style( 'jquery-ui-timepicker-addon', get_stylesheet_directory_uri().'/css/jquery-ui-timepicker-addon' . $suffix . '.css' );
+			wp_register_style(
+				'jquery-ui-smoothness',
+				get_stylesheet_directory_uri().'/css/jquery-ui-smoothness.css',
+				array(),
+				filemtime( get_stylesheet_directory().'/css/jquery-ui-smoothness.css' ),
+			);
+			wp_register_style(
+				'jquery-ui-datepicker',
+				get_stylesheet_directory_uri().'/css/datepicker.css',
+				array(),
+				filemtime( get_stylesheet_directory().'/css/datepicker.css' ),
+			);
+			wp_register_style(
+				'jquery-ui-timepicker-addon',
+				get_stylesheet_directory_uri().'/css/jquery-ui-timepicker-addon.css',
+				array(),
+				filemtime( get_stylesheet_directory().'/css/jquery-ui-timepicker-addon.css' ),
+			);
 
 			wp_enqueue_style( 'jquery-ui-smoothness' );
 			wp_enqueue_style( 'jquery-ui-datepicker' );
 			wp_enqueue_style( 'jquery-ui-timepicker-addon' );
 			?>
-			<script>
-				jQuery(document).ready(function($) {
-					$("input[type=datetime]").datetimepicker();
-				});
-			</script>
-		<?php
+				<script>
+					jQuery(document).ready(function($) {
+						$("input[type=datetime]").datetimepicker();
+					});
+				</script>
+			<?php
 		}
-	}	
+	}
 }
 new CityLimits_Create_Meta_Boxes;