House cleaning.

Closes #19, and closes #18.

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## v2.1.0
 
+#### March 12, 2013
+
+* Added `clean` task to build.
+* Moved all vars to tops of functions for jshint and readability's sake.
+* Minor house cleaning.
+
 #### March 11, 2013
 
 * Updated this file.

build/Gruntfile.js

@@ -37,8 +37,10 @@ module.exports = function(grunt) {
 		/*----------------------------------( 01 )----------------------------------*/
 
 		/**
+		 * Validate files with JSHint.
+		 *
 		 * @see http://www.jshint.com/docs/
-		 * @see https://github.com/jshint/jshint/blob/r12/jshint.js#L256
+		 * @see https://github.com/gruntjs/grunt-contrib-jshint
 		 */
 
 		jshint: {
@@ -61,6 +63,32 @@ module.exports = function(grunt) {
 		/*----------------------------------( 02 )----------------------------------*/
 
 		/**
+		 * Clean files and folders.
+		 *
+		 * @see https://github.com/gruntjs/grunt-contrib-clean
+		 */
+
+		clean : {
+
+			options : {
+
+				force : true // Sketchy!
+
+			},
+
+			dist : [
+
+				'../<%= pkg.name %>/**/*'
+
+			]
+
+		},
+
+		/*----------------------------------( 03 )----------------------------------*/
+
+		/**
+		 * Minify files with UglifyJS.
+		 *
 		 * @see https://github.com/gruntjs/grunt-contrib-uglify
 		 */
 
@@ -84,9 +112,11 @@ module.exports = function(grunt) {
 
 		},
 
-		/*----------------------------------( 03 )----------------------------------*/
+		/*----------------------------------( 04 )----------------------------------*/
 
 		/**
+		 * Concatenate files.
+		 *
 		 * @see https://github.com/gruntjs/grunt-contrib-concat
 		 */
 
@@ -113,12 +143,14 @@ module.exports = function(grunt) {
 
 	grunt.loadNpmTasks('grunt-contrib-jshint');
 
+	grunt.loadNpmTasks('grunt-contrib-clean');
+
 	grunt.loadNpmTasks('grunt-contrib-uglify');
 
 	grunt.loadNpmTasks('grunt-contrib-concat');
 
 	//----------------------------------
 
-	grunt.registerTask('default', ['jshint', 'uglify', 'concat']);
+	grunt.registerTask('default', ['jshint', 'clean', 'uglify', 'concat']);
 
 };

build/package.json

@@ -26,8 +26,9 @@
   "dependencies": {},
   "devDependencies": {
     "grunt": "0.4.0",
-    "grunt-contrib-jshint": "0.2.0",
     "grunt-contrib-nodeunit": "0.1.2",
+    "grunt-contrib-jshint": "0.2.0",
+    "grunt-contrib-clean": "0.4.0",
     "grunt-contrib-uglify": "0.1.2",
     "grunt-contrib-concat": "0.1.3"
   }

build/src/onmediaquery.js

@@ -17,14 +17,17 @@
 
 	omq.init = function(query_array) {
 
+		// Declare one `var` statement per function:
+		var i, l;
+
 		// rgne.ws/UJ8hYh
 		this._callbacks    = []; // Container for all callbacks registered with the plugin.
 		this._context      = ''; // Current active query to be read inside callbacks, as `this._last_context` won't be set when they're called!
 		this._last_context = ''; // Current active query.
 
 		if (typeof query_array !== 'undefined') {
 
-			for (var i = 0, l = query_array.length; i < l; i++) {
+			for (i = 0, l = query_array.length; i < l; i++) {
 
 				this.addQuery(query_array[i]);
 
@@ -91,9 +94,11 @@
 
 	omq.removeQuery = function(query_object) {
 
+		var match;
+
 		if (query_object) { // rgne.ws/VpFmUI
 
-			var match = -1;
+			match = -1;
 
 			while ((match = this._callbacks.indexOf(query_object)) > -1) {
 
@@ -187,10 +192,8 @@
 	_triggerCallbacks = function(size, key) {
 
 		if (size && key) {
-
-			var callback_function,
-			    i,
-			    l;
+
+			var callback_function, i, l;
 
 			for (i = 0, l = this._callbacks.length; i < l; i++) {
 
@@ -285,7 +288,9 @@
 
 	_inArray = function(needle, haystack) {
 
-		for (var i = 0, l = haystack.length; i < l; i++) {
+		var i, l;
+
+		for (i = 0, l = haystack.length; i < l; i++) {
 
 			if (haystack[i] == needle) {
 

onmediaquery/onmediaquery.js

@@ -8,7 +8,7 @@
  * @copyright Copyright (c) 2013 Josh Barr.
  * @license Released under the Released under the MIT license..
  * @version 2.1.0
- * @date 2013/03/11
+ * @date 2013/03/12
  */
 
 (function(omq) { // rgne.ws/V4HOQy
@@ -30,14 +30,17 @@
 
 	omq.init = function(query_array) {
 
+		// Declare one `var` statement per function:
+		var i, l;
+
 		// rgne.ws/UJ8hYh
 		this._callbacks    = []; // Container for all callbacks registered with the plugin.
 		this._context      = ''; // Current active query to be read inside callbacks, as `this._last_context` won't be set when they're called!
 		this._last_context = ''; // Current active query.
 
 		if (typeof query_array !== 'undefined') {
 
-			for (var i = 0, l = query_array.length; i < l; i++) {
+			for (i = 0, l = query_array.length; i < l; i++) {
 
 				this.addQuery(query_array[i]);
 
@@ -104,9 +107,11 @@
 
 	omq.removeQuery = function(query_object) {
 
+		var match;
+
 		if (query_object) { // rgne.ws/VpFmUI
 
-			var match = -1;
+			match = -1;
 
 			while ((match = this._callbacks.indexOf(query_object)) > -1) {
 
@@ -200,10 +205,8 @@
 	_triggerCallbacks = function(size, key) {
 
 		if (size && key) {
-
-			var callback_function,
-			    i,
-			    l;
+
+			var callback_function, i, l;
 
 			for (i = 0, l = this._callbacks.length; i < l; i++) {
 
@@ -298,7 +301,9 @@
 
 	_inArray = function(needle, haystack) {
 
-		for (var i = 0, l = haystack.length; i < l; i++) {
+		var i, l;
+
+		for (i = 0, l = haystack.length; i < l; i++) {
 
 			if (haystack[i] == needle) {