Fix small UI bugs and typos.

Author: alexmacarthur

.editorconfig

@@ -0,0 +1,21 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+# WordPress Coding Standards
+# https://make.wordpress.org/core/handbook/coding-standards/
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = tab
+
+[{package.json,*.yml}]
+indent_style = space
+indent_size = 2
+
+[{*.txt,wp-config-sample.php}]
+end_of_line = crlf

README.md

@@ -108,6 +108,10 @@ As mentioned, the techniques used here are largely supported by modern browsers,
 * Improve user interface. 
 * Improve documentation.
 
+#### 1.1.1
+* Append plugin version to admin assets to ensure they're not cached after updates.
+* Fix miscellaneous UI-related bugs appearing in the admin.
+
 ## Feedback
 You like it? [Email](mailto:alex@macarthur.me) or [tweet](http://www.twitter.com/amacarthur) me. You hate it? [Email](mailto:alex@macarthur.me) or [tweet](http://www.twitter.com/amacarthur) me.
 

better-resource-hints.php

@@ -2,7 +2,7 @@
 /**
 * Plugin Name: Better Resource Hints
 * Description: Easy preloading, prefetching, HTTP/2 server pushing, and more for your CSS and JavaScript.
-* Version: 1.1.0
+* Version: 1.1.1
 * Author: Alex MacArthur
 * Author URI: http://macarthur.me
 * License: GPLv2 or later
@@ -11,6 +11,8 @@
 
 namespace BetterResourceHints;
 
+require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+
 require_once 'src/Settings.php';
 require_once 'src/Filters.php';
 require_once 'src/Preconnector.php';
@@ -26,6 +28,7 @@ class App {
 
 	private static $instance;
 
+	protected static $plugin_data = null;
   protected static $options_prefix = 'better_resource_hints';
   protected static $admin_settings_page_slug = 'better_resource_hints';
   protected static $copy = array(
@@ -39,6 +42,8 @@ public static function init() {
   }
 
   public function __construct() {
+		self::$plugin_data = get_plugin_data(__DIR__ . '/better-resource-hints.php');
+
 		new Filters;
     new Settings;
 		new Preloader;
@@ -54,8 +59,8 @@ public function __construct() {
    * @return void
    */
   public function enqueue_styles_and_scripts() {
-    wp_enqueue_style( 'better-resource-hints', plugin_dir_url( __FILE__ ) . 'src/assets/css/style.css', array(), null);
-    wp_enqueue_script( 'better-resource-hints', plugin_dir_url( __FILE__ ) . 'src/assets/js/scripts.min.js', array(), false, true);
+    wp_enqueue_style( 'better-resource-hints', plugin_dir_url( __FILE__ ) . 'src/assets/css/style.css', array(), self::$plugin_data['Version']);
+    wp_enqueue_script( 'better-resource-hints', plugin_dir_url( __FILE__ ) . 'src/assets/js/scripts.min.js', array(), self::$plugin_data['Version'], true);
   }
 
 }

composer.json

@@ -4,7 +4,7 @@
   "type": "wordpress-plugin",
   "minimum-stability": "stable",
 	"license": "GPL-2.0",
-	"version": "1.1.0",
+	"version": "1.1.1",
   "authors": [
     {
       "name": "Alex MacArthur",

package.json

@@ -4,7 +4,7 @@
   "email": "alex@macarthur.me",
   "url": "https://macarthur.me",
   "description": "Easy preloading, prefetching, HTTP/2 server pushing, and more for your CSS and JavaScript.",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "license": "GPL-2.0",
   "main": "better-resource-hints.php",
   "repository": "https://github.com/alexmacarthur/wp-better-resource-hints",

readme.txt

@@ -4,8 +4,8 @@ Contributors: alexmacarthur
 Donate link: paypal.me/alexmacarthur
 Tags: performance, resource hints, prefetch, preload, server push, HTTP/2
 Requires at least: 4.0
-Tested up to: 4.9.5
-Stable tag: 1.1.0
+Tested up to: 4.9.6
+Stable tag: 1.1.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -137,6 +137,10 @@ First, ensure your server is configured to support server push. Then, you can us
 * Improve user interface.
 * Improve documentation.
 
+= 1.1.1 =
+* Append plugin version to admin assets to ensure they're not cached after updates.
+* Fix miscellaneous UI-related bugs appearing in the admin.
+
 == Feedback ==
 
 You like it? [Email](mailto:alex@macarthur.me) or [tweet](http://www.twitter.com/amacarthur) me. You hate it? [Email](mailto:alex@macarthur.me) or [tweet](http://www.twitter.com/amacarthur) me.

src/inc/preloaded-server-push.php

@@ -8,7 +8,7 @@
 
 	<div class="InputBlock">
 		<div class="InputBlock-row">
-			<label for="preload_assets_enable_server_push">Yes, Server Push Preloaded Styles</label>
+			<label for="preload_assets_enable_server_push">Yes, Server Push Preloaded Assets</label>
 			<input type="checkbox"
 			<?php checked($value, 'on'); ?>
 			id="preload_assets_enable_server_push"

src/inc/promo.php

@@ -9,19 +9,27 @@
 
 	<ul class="FeedbackList">
 		<li class="FeedbackList-item FeedbackItem">
-			<a class="FeedbackItem-link FeedbackItem-link--github" href="https://github.com/alexmacarthur/wp-better-resource-hints" target="_blank"><?php echo file_get_contents(plugin_dir_url( __FILE__ ) . '../assets/img/github.svg'); ?></a>
+			<a class="FeedbackItem-link FeedbackItem-link--github" href="https://github.com/alexmacarthur/wp-better-resource-hints" target="_blank">
+				<?php echo file_get_contents(plugin_dir_path( __FILE__ ) . '../assets/img/github.svg'); ?>
+			</a>
 			<span class="FeedbackItem-text"><p><a href="https://github.com/alexmacarthur/wp-better-resource-hints">Star</a> it.</p></span>
 		</li>
 		<li class="FeedbackList-item FeedbackItem">
-			<a class="FeedbackItem-link" href="https://wordpress.org/plugins/better-resource-hints/?rate=5#new-post" target="_blank"><?php echo file_get_contents(plugin_dir_url( __FILE__ ) . '../assets/img/wordpress.svg'); ?></a>
+			<a class="FeedbackItem-link" href="https://wordpress.org/plugins/better-resource-hints/?rate=5#new-post" target="_blank">
+				<?php echo file_get_contents(plugin_dir_path( __FILE__ ) . '../assets/img/wordpress.svg'); ?>
+			</a>
 			<span class="FeedbackItem-text"><p><a href="https://wordpress.org/plugins/better-resource-hints/?rate=5#new-post">Review</a> it.</p></span>
 		</li>
 		<li class="FeedbackList-item FeedbackItem">
-			<a class="FeedbackItem-link" href="https://twitter.com/home?status=I've%20seen%20some%20serious%20performance%20improvements%20after%20installing%20%40amacarthur's%20Better%20Resource%20Hints%20plugin%20for%20%23WordPress!%20https%3A//wordpress.org/plugins/better-resource-hints/" target="_blank"><?php echo file_get_contents(plugin_dir_url( __FILE__ ) . '../assets/img/twitter.svg'); ?></a>
+			<a class="FeedbackItem-link" href="https://twitter.com/home?status=I've%20seen%20some%20serious%20performance%20improvements%20after%20installing%20%40amacarthur's%20Better%20Resource%20Hints%20plugin%20for%20%23WordPress!%20https%3A//wordpress.org/plugins/better-resource-hints/" target="_blank">
+				<?php echo file_get_contents(plugin_dir_path( __FILE__ ) . '../assets/img/twitter.svg'); ?>
+			</a>
 			<span class="FeedbackItem-text"><p><a href="https://twitter.com/home?status=I've%20seen%20some%20serious%20performance%20improvements%20after%20installing%20%40amacarthur's%20Better%20Resource%20Hints%20plugin%20for%20%23WordPress!%20https%3A//wordpress.org/plugins/better-resource-hints/">Tweet</a> about it.</p></span>
 		</li>
 		<li class="FeedbackList-item FeedbackItem">
-			<a class="FeedbackItem-link FeedbackItem-link--mail" href="https://macarthur.me/contact" target="_blank"><?php echo file_get_contents(plugin_dir_url( __FILE__ ) . '../assets/img/envelope.svg'); ?></a>
+			<a class="FeedbackItem-link FeedbackItem-link--mail" href="https://macarthur.me/contact" target="_blank">
+				<?php echo file_get_contents(plugin_dir_path( __FILE__ ) . '../assets/img/envelope.svg'); ?>
+			</a>
 			<span class="FeedbackItem-text"><p><a href="https://macarthur.me/contact">Email</a> me.</p></span>
 		</li>
 	</ul>