From 91945d9dc2e61f8730c6af9d59668f73905f7cc7 Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Mon, 13 Mar 2017 17:12:05 -0400
Subject: [PATCH] Restructure JS and uglification

---
 .editorconfig                           |  11 ++
 Gruntfile.js                            |  19 ++-
 assets/js/restricted-site-access.min.js |   1 +
 assets/js/src/restricted-site-access.js | 146 ++++++++++++++++++++++++
 package.json                            |   5 +-
 restricted-site-access.dev.js           | 146 ------------------------
 restricted-site-access.js               |   1 -
 restricted_site_access.php              |  11 +-
 8 files changed, 185 insertions(+), 155 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 assets/js/restricted-site-access.min.js
 create mode 100644 assets/js/src/restricted-site-access.js
 delete mode 100644 restricted-site-access.dev.js
 delete mode 100644 restricted-site-access.js

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..f72fc293
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,11 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+
+[*.{php,js,css,scss}]
+end_of_line = lf
+insert_final_newline = true
+indent_style = tab
+indent_size = 4
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index 2a41abfb..442e813a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -12,10 +12,21 @@ module.exports = function(grunt) {
 					updatePoFiles: true
 				}
 			}
-	}
-	});
+		},
 
-	grunt.loadNpmTasks('grunt-wp-i18n');
+		uglify: {
+			js: {
+				files: {
+					'assets/js/restricted-site-access.min.js': ['assets/js/src/restricted-site-access.js'],
+				}
+			}
+		}
+
+	});
+	
+	grunt.loadNpmTasks( 'grunt-wp-i18n' );
+	grunt.loadNpmTasks( 'grunt-contrib-uglify' );
 
-	grunt.registerTask('i18n', ['makepot']);
+	grunt.registerTask( 'i18n', ['makepot'] );
+	grunt.registerTask( 'default', ['uglify:js'] );
 };
diff --git a/assets/js/restricted-site-access.min.js b/assets/js/restricted-site-access.min.js
new file mode 100644
index 00000000..5b49116b
--- /dev/null
+++ b/assets/js/restricted-site-access.min.js
@@ -0,0 +1 @@
+!function(a,b){"use strict";function c(a){if(""==b.trim(a))return!1;e.add_btn.attr("disabled","disabled");var c=b(d.querySelectorAll("#ip_list input")),f=0;for(c.length;f<c.length;f++)if(c[f].value==a)return b(c[f]).parent().effect("shake",600),e.add_btn.removeAttr("disabled"),!1;jQuery.post(ajaxurl,{action:"rsa_ip_check",ip_address:a},function(c){if(c)return b(e.new_ip.parentNode).effect("shake",600),e.add_btn.removeAttr("disabled"),!1;var d=e.empty_ip.clone().appendTo(e.ip_list_wrap);return d.children("input").val(a),d.removeAttr("id").slideDown(250),a==e.new_ip.value&&b(e.new_ip).val(""),e.add_btn.removeAttr("disabled"),!0})}var d=a.document,e={add_btn:"",new_ip:"",ip_list_wrap:"",empty_ip:"",restrict_radio:"",table:"",redirect_choice:"",message_choice:"",page_choice:"",redirect_fields:"",message_field:"",page_field:""};!function(){e.add_btn=b(d.getElementById("addip")),e.new_ip=d.getElementById("newip"),e.ip_list_wrap=d.getElementById("ip_list"),e.empty_ip=b(d.getElementById("ip_list_empty")),e.restrict_radio=d.getElementById("blog-restricted"),e.table=b(d.getElementById("rsa-send-to-login")).closest("table"),e.redirect_choice=d.getElementById("rsa-redirect-visitor"),e.message_choice=d.getElementById("rsa-display-message"),e.page_choice=d.getElementById("rsa-unblocked-page"),e.redirect_fields=b(d.querySelectorAll(".rsa_redirect_field")).closest("tr"),e.message_field=b(d.getElementById("rsa_message")).closest("tr"),e.page_field=b(d.getElementById("rsa_page")).closest("tr"),d.getElementById("blog-restricted").checked||e.table.hide(),d.getElementById("rsa-redirect-visitor").checked||e.redirect_fields.hide(),d.getElementById("rsa-display-message").checked||e.message_field.hide(),d.getElementById("rsa-unblocked-page").checked||e.page_field.hide(),b(d.querySelectorAll("#rsa_handle_fields input")).on("change",function(){e.redirect_choice.checked?e.redirect_fields.show():e.redirect_fields.hide(),e.message_choice.checked?e.message_field.show():e.message_field.hide(),e.page_choice.checked?e.page_field.show():e.page_field.hide()}),b(d.querySelectorAll(".option-site-visibility input")).on("change",function(){e.restrict_radio.checked?e.table.show():e.table.hide()}),e.add_btn.on("click",function(){c(e.new_ip.value)});var a=d.getElementById("rsa_myip");null!==a&&b(a).on("click",function(){c(b(this).data("myip"))}),b(e.ip_list_wrap).on("click",".remove_btn",function(){b(this.parentNode).slideUp(250,function(){b(this).remove()})})}()}(window,jQuery);
\ No newline at end of file
diff --git a/assets/js/src/restricted-site-access.js b/assets/js/src/restricted-site-access.js
new file mode 100644
index 00000000..8b285e17
--- /dev/null
+++ b/assets/js/src/restricted-site-access.js
@@ -0,0 +1,146 @@
+/**
+ * 10up
+ * http://10up.com
+ *
+ * Copyright (c) 2013 10up, jakemgold
+ * Licensed under the GPLv2+ license.
+ */
+(function (window, $) {
+
+	'use strict';
+	var document = window.document;
+
+	var Cache = {
+		add_btn : '',
+		new_ip : '',
+		ip_list_wrap : '',
+		empty_ip : '',
+		restrict_radio : '',
+		table : '',
+		redirect_choice : '',
+		message_choice : '',
+		page_choice : '',
+		redirect_fields : '',
+		message_field : '',
+		page_field : ''
+	};
+
+	function init() {
+
+		Cache.add_btn = $( document.getElementById( 'addip' ) );
+		Cache.new_ip = document.getElementById( 'newip' );
+		Cache.ip_list_wrap = document.getElementById( 'ip_list' );
+		Cache.empty_ip = $( document.getElementById( 'ip_list_empty' ) );
+		Cache.restrict_radio = document.getElementById( 'blog-restricted' );
+		Cache.table = $( document.getElementById( 'rsa-send-to-login' ) ).closest( 'table' );
+		Cache.redirect_choice = document.getElementById( 'rsa-redirect-visitor' );
+		Cache.message_choice = document.getElementById( 'rsa-display-message' );
+		Cache.page_choice = document.getElementById( 'rsa-unblocked-page' );
+		Cache.redirect_fields = $( document.querySelectorAll( '.rsa_redirect_field' ) ).closest( 'tr' );
+		Cache.message_field = $( document.getElementById( 'rsa_message' ) ).closest( 'tr' );
+		Cache.page_field = $( document.getElementById( 'rsa_page' ) ).closest( 'tr' );
+
+		if ( ! document.getElementById( 'blog-restricted' ).checked ) {
+			Cache.table.hide();
+		}
+
+		if ( ! document.getElementById( 'rsa-redirect-visitor' ).checked ) {
+			Cache.redirect_fields.hide();
+		}
+
+		if ( ! document.getElementById( 'rsa-display-message' ).checked ) {
+			Cache.message_field.hide();
+		}
+
+		if ( ! document.getElementById( 'rsa-unblocked-page' ).checked ) {
+			Cache.page_field.hide();
+		}
+
+		$( document.querySelectorAll( '#rsa_handle_fields input' ) ).on('change',function(){
+
+			if ( Cache.redirect_choice.checked ) {
+				Cache.redirect_fields.show();
+			} else {
+				Cache.redirect_fields.hide();
+			}
+
+			if ( Cache.message_choice.checked ) {
+				Cache.message_field.show();
+			} else {
+				Cache.message_field.hide();
+			}
+
+			if ( Cache.page_choice.checked ) {
+				Cache.page_field.show();
+			} else {
+				Cache.page_field.hide();
+			}
+
+		});
+
+		$( document.querySelectorAll( '.option-site-visibility input' ) ).on('change',function(){
+			if ( Cache.restrict_radio.checked ) {
+				Cache.table.show();
+			} else {
+				Cache.table.hide();
+			}
+		});
+
+		Cache.add_btn.on('click',function(){
+			add_ip( Cache.new_ip.value );
+		});
+
+		var myip_btn = document.getElementById( 'rsa_myip' );
+		if ( null !== myip_btn ) {
+			$( myip_btn ).on('click',function(){
+				add_ip( $( this ).data( 'myip' ) );
+			});
+		}
+
+		$( Cache.ip_list_wrap ).on('click', '.remove_btn', function(){
+			$( this.parentNode ).slideUp( 250, function(){ $( this ).remove(); } );
+		});
+
+	}
+
+	function add_ip( ip ) {
+		if ( $.trim( ip ) == '' ) {
+			return false;
+		}
+
+		var shake_speed = 600;
+
+		Cache.add_btn.attr( 'disabled', 'disabled' );
+		var ip_list = $( document.querySelectorAll( '#ip_list input' ) );
+
+		for ( var i = 0, l = ip_list.length; i < ip_list.length; i++ ) {
+			if ( ip_list[i].value == ip ) {
+				$( ip_list[i] ).parent().effect( 'shake', shake_speed );
+				Cache.add_btn.removeAttr( 'disabled' );
+				return false;
+			}
+		}
+
+		jQuery.post( ajaxurl, { action: 'rsa_ip_check', 'ip_address': ip }, function(response) {
+			if ( response ) {
+				$( Cache.new_ip.parentNode ).effect( 'shake', shake_speed );
+				Cache.add_btn.removeAttr( 'disabled' );
+				return false;
+			} else {
+				var new_ip = Cache.empty_ip.clone().appendTo( Cache.ip_list_wrap );
+				new_ip.children( 'input' ).val( ip );
+				new_ip.removeAttr( 'id' ).slideDown( 250 );
+
+				if ( ip == Cache.new_ip.value ) {
+					$( Cache.new_ip ).val( '' );
+				}
+				Cache.add_btn.removeAttr( 'disabled' );
+
+				return true;
+			}
+		} );
+	}
+
+	init();
+
+})(window,jQuery);
diff --git a/package.json b/package.json
index dda2f7a4..18ace0b2 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,9 @@
-
 {
   "name": "restricted-site-access",
   "description": "Limit access to visitors who are logged in or allowed by IP addresses. Includes many options for handling blocked visitors.",
-  "dependencies": {},
+  "dependencies": {
+    "grunt-contrib-uglify": "^2.2.0"
+  },
   "devDependencies": {
     "grunt": "^0.4.5",
     "grunt-wp-i18n": "^0.5.4"
diff --git a/restricted-site-access.dev.js b/restricted-site-access.dev.js
deleted file mode 100644
index 4c099f48..00000000
--- a/restricted-site-access.dev.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * 10up
- * http://10up.com
- *
- * Copyright (c) 2013 10up, jakemgold
- * Licensed under the GPLv2+ license.
- */
-(function (window, $) {
-
-	'use strict';
-	var document = window.document;
-
-	var Cache = {
-		add_btn : '',
-		new_ip : '',
-		ip_list_wrap : '',
-		empty_ip : '',
-		restrict_radio : '',
-		table : '',
-		redirect_choice : '',
-		message_choice : '',
-		page_choice : '',
-		redirect_fields : '',
-		message_field : '',
-		page_field : ''
-	};
-
-	function init() {
-
-		Cache.add_btn = $( document.getElementById('addip') );
-		Cache.new_ip = document.getElementById('newip');
-		Cache.ip_list_wrap = document.getElementById('ip_list');
-		Cache.empty_ip = $( document.getElementById('ip_list_empty') );
-		Cache.restrict_radio = document.getElementById('blog-restricted');
-		Cache.table = $( document.getElementById('rsa-send-to-login') ).closest('table');
-		Cache.redirect_choice = document.getElementById('rsa-redirect-visitor');
-		Cache.message_choice = document.getElementById('rsa-display-message');
-		Cache.page_choice = document.getElementById('rsa-unblocked-page');
-		Cache.redirect_fields = $( document.querySelectorAll('.rsa_redirect_field') ).closest('tr');
-		Cache.message_field = $( document.getElementById('rsa_message') ).closest('tr');
-		Cache.page_field = $( document.getElementById('rsa_page') ).closest('tr');
-
-		if ( ! document.getElementById('blog-restricted').checked ) {
-			Cache.table.hide();
-		}
-
-		if ( ! document.getElementById('rsa-redirect-visitor').checked ) {
-			Cache.redirect_fields.hide();
-		}
-
-		if ( ! document.getElementById('rsa-display-message').checked ) {
-			Cache.message_field.hide();
-		}
-
-		if ( ! document.getElementById('rsa-unblocked-page').checked ) {
-			Cache.page_field.hide();
-		}
-
-		$( document.querySelectorAll('#rsa_handle_fields input') ).on('change',function(){
-
-			if ( Cache.redirect_choice.checked ) {
-				Cache.redirect_fields.show();
-			} else {
-				Cache.redirect_fields.hide();
-			}
-
-			if ( Cache.message_choice.checked ) {
-				Cache.message_field.show();
-			} else {
-				Cache.message_field.hide();
-			}
-
-			if ( Cache.page_choice.checked ) {
-				Cache.page_field.show();
-			} else {
-				Cache.page_field.hide();
-			}
-
-		});
-
-		$( document.querySelectorAll('.option-site-visibility input') ).on('change',function(){
-			if ( Cache.restrict_radio.checked ) {
-				Cache.table.show();
-			} else {
-				Cache.table.hide();
-			}
-		});
-
-		Cache.add_btn.on('click',function(){
-			add_ip( Cache.new_ip.value );
-		});
-
-		var myip_btn = document.getElementById('rsa_myip');
-		if ( null !== myip_btn ) {
-			$(myip_btn).on('click',function(){
-				add_ip( $(this).data('myip') );
-			});
-		}
-
-		$(Cache.ip_list_wrap).on('click', '.remove_btn', function(){
-			$( this.parentNode ).slideUp( 250, function(){ $(this).remove(); } );
-		});
-
-	}
-
-	function add_ip( ip ) {
-		if ( $.trim( ip ) == '' ) {
-			return false;
-		}
-
-		var shake_speed = 600;
-
-		Cache.add_btn.attr('disabled', 'disabled');
-		var ip_list = $( document.querySelectorAll('#ip_list input') );
-
-		for ( var i = 0, l = ip_list.length; i < ip_list.length; i++ ) {
-			if( ip_list[i].value == ip ) {
-				$( ip_list[i] ).parent().effect( 'shake', shake_speed );
-				Cache.add_btn.removeAttr('disabled');
-				return false;
-			}
-		}
-
-		jQuery.post( ajaxurl, { action: 'rsa_ip_check', 'ip_address': ip }, function(response) {
-			if ( response ) {
-				$( Cache.new_ip.parentNode ).effect( 'shake', shake_speed );
-				Cache.add_btn.removeAttr('disabled');
-				return false;
-			} else {
-				var new_ip = Cache.empty_ip.clone().appendTo(Cache.ip_list_wrap);
-				new_ip.children('input').val(ip);
-				new_ip.removeAttr('id').slideDown(250);
-
-				if ( ip == Cache.new_ip.value ) {
-					$(Cache.new_ip).val('');
-				}
-				Cache.add_btn.removeAttr('disabled');
-
-				return true;
-			}
-		} );
-	}
-
-	init();
-
-})(window,jQuery);
\ No newline at end of file
diff --git a/restricted-site-access.js b/restricted-site-access.js
deleted file mode 100644
index bcdc836d..00000000
--- a/restricted-site-access.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(e,t){"use strict";function i(){r.add_btn=t(n.getElementById("addip"));r.new_ip=n.getElementById("newip");r.ip_list_wrap=n.getElementById("ip_list");r.empty_ip=t(n.getElementById("ip_list_empty"));r.restrict_radio=n.getElementById("blog-restricted");r.table=t(n.getElementById("rsa-send-to-login")).closest("table");r.redirect_choice=n.getElementById("rsa-redirect-visitor");r.message_choice=n.getElementById("rsa-display-message");r.page_choice=n.getElementById("rsa-unblocked-page");r.redirect_fields=t(n.querySelectorAll(".rsa_redirect_field")).closest("tr");r.message_field=t(n.getElementById("rsa_message")).closest("tr");r.page_field=t(n.getElementById("rsa_page")).closest("tr");if(!n.getElementById("blog-restricted").checked){r.table.hide()}if(!n.getElementById("rsa-redirect-visitor").checked){r.redirect_fields.hide()}if(!n.getElementById("rsa-display-message").checked){r.message_field.hide()}if(!n.getElementById("rsa-unblocked-page").checked){r.page_field.hide()}t(n.querySelectorAll("#rsa_handle_fields input")).on("change",function(){if(r.redirect_choice.checked){r.redirect_fields.show()}else{r.redirect_fields.hide()}if(r.message_choice.checked){r.message_field.show()}else{r.message_field.hide()}if(r.page_choice.checked){r.page_field.show()}else{r.page_field.hide()}});t(n.querySelectorAll(".option-site-visibility input")).on("change",function(){if(r.restrict_radio.checked){r.table.show()}else{r.table.hide()}});r.add_btn.on("click",function(){s(r.new_ip.value)});var e=n.getElementById("rsa_myip");if(null!==e){t(e).on("click",function(){s(t(this).data("myip"))})}t(r.ip_list_wrap).on("click",".remove_btn",function(){t(this.parentNode).slideUp(250,function(){t(this).remove()})})}function s(e){if(t.trim(e)==""){return false}var i=600;r.add_btn.attr("disabled","disabled");var s=t(n.querySelectorAll("#ip_list input"));for(var o=0,u=s.length;o<s.length;o++){if(s[o].value==e){t(s[o]).parent().effect("shake",i);r.add_btn.removeAttr("disabled");return false}}jQuery.post(ajaxurl,{action:"rsa_ip_check",ip_address:e},function(n){if(n){t(r.new_ip.parentNode).effect("shake",i);r.add_btn.removeAttr("disabled");return false}else{var s=r.empty_ip.clone().appendTo(r.ip_list_wrap);s.children("input").val(e);s.removeAttr("id").slideDown(250);if(e==r.new_ip.value){t(r.new_ip).val("")}r.add_btn.removeAttr("disabled");return true}})}var n=e.document;var r={add_btn:"",new_ip:"",ip_list_wrap:"",empty_ip:"",restrict_radio:"",table:"",redirect_choice:"",message_choice:"",page_choice:"",redirect_fields:"",message_field:"",page_field:""};i()})(window,jQuery)
\ No newline at end of file
diff --git a/restricted_site_access.php b/restricted_site_access.php
index 62f0d3b8..720c54c0 100644
--- a/restricted_site_access.php
+++ b/restricted_site_access.php
@@ -9,6 +9,8 @@
  * License: GPLv2 or later
  */
 
+define( 'RSA_VERSION', '5.2' );
+
 class Restricted_Site_Access {
 
 	private static $rsa_options, $basename;
@@ -266,8 +268,13 @@ public static function privacy_on_link_title( $text ) {
 	 * Loads needed scripts and assets on the Reading page
 	 */
 	public static function load_options_page() {
-		$dev = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '.dev' : '';
-		wp_enqueue_script( 'restricted-site-access', plugin_dir_url( __FILE__ ) . 'restricted-site-access' . $dev . '.js', array( 'jquery-effects-shake' ), '5.1', true );
+		$js_path = plugin_dir_url( __FILE__ ) . '/assets/js/restricted-site-access.min.js';
+
+		if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+			$js_path = plugin_dir_url( __FILE__ ) . '/assets/js/src/restricted-site-access.js';
+		}
+
+		wp_enqueue_script( 'restricted-site-access', $js_path, array( 'jquery-effects-shake' ), RSA_VERSION, true );
 
 		add_action( 'admin_notices', array( __CLASS__, 'admin_notice' ) );
 		add_action( 'admin_head', array( __CLASS__, 'admin_head' ) );