Merge pull request #1575 from INN/1550-filemtime

Change enqueues to use filemtime instead of no version number or Largo's version number
WPBuddy · Nov 15, 2018 · 187eca0 · 187eca0
2 parents fdf5662 + f8285ef
commit 187eca0
Show file tree

Hide file tree

Showing 14 changed files with 150 additions and 33 deletions.
diff --git a/changelog.md b/changelog.md
@@ -9,6 +9,11 @@ though this project doesn't succeed in adhering to [Semantic Versioning](https:/
 
 This release contains bugfixes for Largo 0.6.
 
+### Changes
+
+- Uses [`filemtime()`](https://secure.php.net/manual/en/function.filemtime.php) as the version number for more enqueued assets, meaning that cachebusting will be handled by file modification time and not by Largo version. [Pull Request #1575](https:/INN/largo/pull/1575) for [issue #1550](https:/INN/largo/issues/1550).
+- For many assets where no version number was provided for enqueued assets, `largo_version()` is now used. [Pull Request #1575](https:/INN/largo/pull/1575) for [issue #1550](https:/INN/largo/issues/1550).
+
 ### Fixes
 
 - Updates templates to make sure that bylines are output. [Pull request #1574](https:/INN/largo/pull/1574).

diff --git a/inc/ajax-functions.php b/inc/ajax-functions.php
@@ -21,12 +21,13 @@
  */
  function largo_load_more_posts_enqueue_script() {
  $suffix = (LARGO_DEBUG)? '' : '.min';
- $version = largo_version();
 
  wp_enqueue_script(
  'load-more-posts',
  get_template_directory_uri() . '/js/load-more-posts'. $suffix . '.js',
- array('jquery'), $version, false
+ array('jquery'),
+ filemtime( get_template_directory() . '/js/load-more-posts' . $suffix . '.js' ),
+ false
  );
  }
  add_action( 'wp_enqueue_scripts', 'largo_load_more_posts_enqueue_script' );

diff --git a/inc/avatars/admin.php b/inc/avatars/admin.php
@@ -1,7 +1,12 @@
 <?php
 
 function largo_load_avatar_js() {
- wp_enqueue_script('largo_avatar_js', get_template_directory_uri() . '/inc/avatars/js/avatars.js', array('jquery'));
+ wp_enqueue_script(
+ 'largo_avatar_js',
+ get_template_directory_uri() . '/inc/avatars/js/avatars.js',
+ array('jquery'),
+ largo_version()
+ );
  wp_localize_script('largo_avatar_js', 'largo_avatar_js_L10n', array(
  'update_text' => __('Click "Update Profile" to save your avatar.', 'largo')
  ));

diff --git a/inc/customizer/customizer.php b/inc/customizer/customizer.php
@@ -338,10 +338,18 @@ public function action_customize_preview_init() {
  * Enqueue scripts and styles specific to the Largo Customizer
  */
  public function action_customize_controls_enqueue_scripts() {
-
- wp_enqueue_script( 'largo-customizer', get_template_directory_uri() . '/inc/customizer/js/customizer.js', array( 'jquery' ) );
- wp_enqueue_style( 'largo-customizer', get_template_directory_uri() . '/inc/customizer/css/customizer.css' );
-
+ wp_enqueue_script(
+ 'largo-customizer',
+ get_template_directory_uri() . '/inc/customizer/js/customizer.js',
+ array( 'jquery' ),
+ largo_version()
+ );
+ wp_enqueue_style(
+ 'largo-customizer',
+ get_template_directory_uri() . '/inc/customizer/css/customizer.css',
+ array(),
+ largo_version()
+ );
  }
 
  /**

diff --git a/inc/enqueue.php b/inc/enqueue.php
@@ -111,7 +111,12 @@ function largo_enqueue_child_theme_css() {
  $theme = wp_get_theme();
 
  if (is_object($theme->parent())) {
- wp_enqueue_style( 'largo-child-styles', get_stylesheet_directory_uri() . '/style.css', array('largo-stylesheet'));
+ wp_enqueue_style(
+ 'largo-child-styles',
+ get_stylesheet_directory_uri() . '/style.css',
+ array(),
+ filemtime( get_stylesheet_directory() . '/style.css' )
+ );
  }
  }
  add_action( 'wp_enqueue_scripts', 'largo_enqueue_child_theme_css' );
@@ -126,8 +131,19 @@ function largo_enqueue_admin_scripts() {
 
  // Use minified assets if LARGO_DEBUG isn't true.
  $suffix = (LARGO_DEBUG)? '' : '.min';
- wp_enqueue_style( 'largo-admin-widgets', get_template_directory_uri().'/css/widgets-php' . $suffix . '.css' );
- wp_enqueue_script( 'largo-admin-widgets', get_template_directory_uri() . '/js/widgets-php' . $suffix . '.js', array( 'jquery' ), '1.0', true );
+ wp_enqueue_style(
+ 'largo-admin-widgets',
+ get_template_directory_uri() . '/css/widgets-php' . $suffix . '.css',
+ array(),
+ largo_version()
+ );
+ wp_enqueue_script(
+ 'largo-admin-widgets',
+ get_template_directory_uri() . '/js/widgets-php' . $suffix . '.js',
+ array( 'jquery' ),
+ largo_version(),
+ true
+ );
 }
 add_action( 'admin_enqueue_scripts', 'largo_enqueue_admin_scripts' );
 

diff --git a/inc/featured-media.php b/inc/featured-media.php
@@ -293,8 +293,8 @@ function largo_enqueue_featured_media_js( $hook ) {
  'largo_featured_media',
  get_template_directory_uri() . '/js/featured-media' . $suffix . '.js',
  array( 'media-models', 'media-views' ),
- false,
- 1
+ largo_version(),
+ true
  );
  wp_localize_script(
  'largo_featured_media',
@@ -313,7 +313,9 @@ function largo_enqueue_featured_media_js( $hook ) {
  );
  wp_enqueue_style(
  'largo_featured_media',
- get_template_directory_uri(). '/css/featured-media' . $suffix . '.css'
+ get_template_directory_uri(). '/css/featured-media' . $suffix . '.css',
+ array(),
+ largo_version()
  );
 
  wp_localize_script( 'largo_featured_media', 'LFM', array(

diff --git a/inc/post-metaboxes.php b/inc/post-metaboxes.php
@@ -208,7 +208,11 @@ function largo_custom_sidebar_js() {
  if ($typenow == 'post') {
  $suffix = (LARGO_DEBUG)? '' : '.min';
  wp_enqueue_script(
- 'custom-sidebar', get_template_directory_uri() . '/js/custom-sidebar' . $suffix . '.js', array('jquery'));
+ 'custom-sidebar',
+ get_template_directory_uri() . '/js/custom-sidebar' . $suffix . '.js',
+ array('jquery'),
+ largo_version()
+ );
 
  $post_templates = get_post_templates();
  $default_sidebar_labels = array();
@@ -320,7 +324,12 @@ function largo_top_terms_js() {
  global $typenow;
  if( $typenow == 'post' ) {
  $suffix = (LARGO_DEBUG)? '' : '.min';
- wp_enqueue_script( 'top-terms', get_template_directory_uri() . '/js/top-terms' . $suffix . '.js', array( 'jquery' ) );
+ wp_enqueue_script(
+ 'top-terms',
+ get_template_directory_uri() . '/js/top-terms' . $suffix . '.js',
+ array( 'jquery' ),
+ largo_version()
+ );
  }
 }
 add_action( 'admin_enqueue_scripts', 'largo_top_terms_js' );

diff --git a/inc/term-icons.php b/inc/term-icons.php
@@ -122,7 +122,10 @@ function display_add_new_field( $taxonomy ) {
  */
  function admin_enqueue_scripts( $hook_suffix ) {
 
- if ( $hook_suffix == 'edit-tags.php' && !empty($_REQUEST['taxonomy']) ) {
+ if (
+ ( $hook_suffix == 'edit-tags.php' || $hook_suffix == 'term.php' )
+ && !empty($_REQUEST['taxonomy'])
+ ) {
  if ( !in_array( $_REQUEST['taxonomy'], $this->get_icon_taxonomies() ) ) {
  // abort if the term doesn't belong to the taxonomies to have icons
  return;
@@ -132,23 +135,53 @@ function admin_enqueue_scripts( $hook_suffix ) {
 
  $this->get_icons_config();
 
- wp_enqueue_style( 'fontello', $this->_css_file );
+ wp_enqueue_style(
+ 'fontello',
+ $this->_css_file,
+ array(),
+ largo_version()
+ );
 
  $path = get_template_directory();
  $dir = get_template_directory_uri();
  $locale = explode( '_', get_locale() );
 
- wp_enqueue_style( 'select2', $dir.'/js/select2/select2.css' );
- wp_enqueue_script( 'select2', $dir.'/js/select2/select2.min.js', array( 'jquery' ) );
+ wp_enqueue_style(
+ 'select2',
+ $dir.'/js/select2/select2.css',
+ array(),
+ largo_version()
+ );
+ wp_enqueue_script(
+ 'select2',
+ $dir.'/js/select2/select2.min.js',
+ array( 'jquery' ),
+ largo_version()
+ );
 
  if ( is_file( $path . '/js/select2/select2_locale_' . implode( '-', $locale ) . '.js' ) ) {
- wp_enqueue_script( 'select2-locale-'. implode( '-', $locale ), $dir . '/js/select2/select2_locale_' . implode( '-', $locale ) . '.js' );
+ wp_enqueue_script(
+ 'select2-locale-'. implode( '-', $locale ),
+ $dir . '/js/select2/select2_locale_' . implode( '-', $locale ) . '.js',
+ array(),
+ largo_version()
+ );
  } elseif ( is_file( $path . '/js/select2/select2_locale_' . $locale[0] . '.js' ) ) {
- wp_enqueue_script( 'select2-locale-'. $locale[0], $dir . '/js/select2/select2_locale_' . $locale[0] . '.js' );
+ wp_enqueue_script(
+ 'select2-locale-'. $locale[0],
+ $dir . '/js/select2/select2_locale_' . $locale[0] . '.js',
+ array(),
+ largo_version()
+ );
  }
 
  $suffix = (LARGO_DEBUG)? '' : '.min';
- wp_enqueue_script( 'custom-term-icons', $dir.'/js/custom-term-icons' . $suffix . '.js' );
+ wp_enqueue_script(
+ 'custom-term-icons',
+ $dir.'/js/custom-term-icons' . $suffix . '.js',
+ array(),
+ largo_version()
+ );
 
  }
  }

diff --git a/inc/update.php b/inc/update.php
@@ -983,10 +983,11 @@ function largo_update_page_enqueue_js() {
  if ( isset( $_GET['page']) && $_GET['page'] == 'update-largo' ) {
  $suffix = ( LARGO_DEBUG ) ? '' : '.min';
  wp_enqueue_script(
- 'largo_update_page', get_template_directory_uri() . '/js/update-page' . $suffix . '.js',
+ 'largo_update_page',
+ get_template_directory_uri() . '/js/update-page' . $suffix . '.js',
  array( 'jquery' ),
- false,
- 1
+ filemtime( get_template_directory() . '/js/update-page' . $suffix . '.js' ),
+ true
  );
  }
 }

diff --git a/inc/widgets/largo-image-widget.php b/inc/widgets/largo-image-widget.php
@@ -13,6 +13,7 @@
  **/
 class largo_image_widget extends WP_Widget {
 
+ // not really sure what this means?
  const VERSION = '4.0.7';
 
  const CUSTOM_IMAGE_SIZE_SLUG = 'largo_image_widget_custom';
@@ -37,7 +38,12 @@ function __construct() {
  */
  function admin_setup() {
  wp_enqueue_media();
- wp_enqueue_script( 'largo-image-widget', get_template_directory_uri() . '/js/image-widget.js', array( 'jquery', 'media-upload', 'media-views' ), self::VERSION );
+ wp_enqueue_script(
+ 'largo-image-widget',
+ get_template_directory_uri() . '/js/image-widget.js',
+ array( 'jquery', 'media-upload', 'media-views' ),
+ self::VERSION
+ );
  wp_localize_script( 'largo-image-widget', 'LargoImageWidget', array(
  'frame_title' => __( 'Select an Image', 'largo' ),
  'button_title' => __( 'Insert Into Widget', 'largo' ),

diff --git a/inc/widgets/largo-twitter.php b/inc/widgets/largo-twitter.php
@@ -64,7 +64,7 @@ function widget( $args, $instance ) {
  'largo_twitter_widget',
  '//platform.twitter.com/widgets.js',
  array(),
- null,
+ largo_version(),
  true
  );
 

diff --git a/inc/wp-taxonomy-landing/functions/cftl-admin.php b/inc/wp-taxonomy-landing/functions/cftl-admin.php
@@ -676,8 +676,19 @@ function cftl_admin_scripts() {
 
  if( $screen->base == 'post' && $screen->post_type == 'cftl-tax-landing') {
  $url = get_template_directory_uri();
- wp_enqueue_script( 'series', $url.'/inc/wp-taxonomy-landing/series.js', array('jquery', 'jquery-ui-sortable'), '0.0.1', true );
- wp_enqueue_style( 'series', $url.'/inc/wp-taxonomy-landing/series.css' );
+ wp_enqueue_script(
+ 'series',
+ $url . '/inc/wp-taxonomy-landing/series.js',
+ array('jquery', 'jquery-ui-sortable'),
+ largo_version(),
+ true
+ );
+ wp_enqueue_style(
+ 'series',
+ $url . '/inc/wp-taxonomy-landing/series.css',
+ array(),
+ largo_version()
+ );
  }
 }
 add_action( 'admin_enqueue_scripts', 'cftl_admin_scripts');

diff --git a/lib/options-framework/options-framework.php b/lib/options-framework/options-framework.php
@@ -172,9 +172,19 @@ function optionsframework_add_page() {
 /* Loads the CSS */
 
 function optionsframework_load_styles() {
- wp_enqueue_style('optionsframework', OPTIONS_FRAMEWORK_DIRECTORY . 'css/optionsframework.css');
+ wp_enqueue_style(
+ 'optionsframework',
+ OPTIONS_FRAMEWORK_DIRECTORY . 'css/optionsframework.css',
+ array(),
+ largo_version()
+ );
  if ( !wp_style_is( 'wp-color-picker','registered' ) ) {
- wp_register_style('wp-color-picker', OPTIONS_FRAMEWORK_DIRECTORY . 'css/color-picker.min.css');
+ wp_register_style(
+ 'wp-color-picker',
+ OPTIONS_FRAMEWORK_DIRECTORY . 'css/color-picker.min.css',
+ array(),
+ largo_version()
+ );
  }
  wp_enqueue_style( 'wp-color-picker' );
 }
@@ -201,7 +211,12 @@ function optionsframework_load_scripts($hook) {
  }
 
  // Enqueue custom option panel JS
- wp_enqueue_script( 'options-custom', OPTIONS_FRAMEWORK_DIRECTORY . 'js/options-custom.js', array( 'jquery','wp-color-picker' ) );
+ wp_enqueue_script(
+ 'options-custom',
+ OPTIONS_FRAMEWORK_DIRECTORY . 'js/options-custom.js',
+ array( 'jquery','wp-color-picker' ),
+ largo_version()
+ );
 
  // Inline scripts from options-interface.php
  add_action( 'admin_head', 'of_admin_head' );

diff --git a/lib/options-framework/options-medialibrary-uploader.php b/lib/options-framework/options-medialibrary-uploader.php
@@ -68,7 +68,12 @@ function optionsframework_mlu_css () {
 
 function optionsframework_mlu_js () {
  // Registers custom scripts for the Media Library AJAX uploader.
- wp_register_script( 'of-medialibrary-uploader', OPTIONS_FRAMEWORK_DIRECTORY .'js/of-medialibrary-uploader.js', array( 'jquery', 'thickbox' ) );
+ wp_register_script(
+ 'of-medialibrary-uploader',
+ OPTIONS_FRAMEWORK_DIRECTORY .'js/of-medialibrary-uploader.js',
+ array( 'jquery', 'thickbox' ),
+ largo_version()
+ );
  wp_enqueue_script( 'of-medialibrary-uploader' );
  wp_enqueue_script( 'media-upload' );
 }