Clean up docs and readme

6 files changed, 36 insertions, 43 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 57001f0..260644f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,10 +22,10 @@ Assuming that you don't see any red, you're ready to go. Just be sure to run `gr
 
 ## Submitting pull requests
 
-1. Create a new branch, please don't work in your `master` branch directly.
+1. Create a new branch, please don't work in your `master` branch directly.  Please pull from the `dev` branch.
 1. Add failing tests for the change you want to make. Run `grunt` to see the tests fail.
 1. Fix stuff.
 1. Run `grunt` to see if the tests pass. Repeat steps 2-4 until done.
 1. Open `test/*.html` unit test file(s) in actual browser to ensure tests pass everywhere.
 1. Update the documentation to reflect any changes.
-1. Push to your fork and submit a pull request.
+1. Push to your fork and submit a pull request (back to the `dev` branch).
diff --git a/dist/index.html b/dist/index.html
index 0d8bea3..8216c65 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -127,8 +127,7 @@
 	<p>Version 1.3.2</p>
 
 	<p>Last updated on 07/07/2013</p>
-	<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under both MIT and GPL licenses. This means that you can choose the license that best suits your project, and use it accordingly. </p>
-	<p><a href="http://trentrichardson.com/Impromptu/GPL-LICENSE.txt" title="GPL License">GPL License</a></p>
+	<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under the MIT license.</p>
 	<p><a href="http://trentrichardson.com/Impromptu/MIT-LICENSE.txt" title="MIT License">MIT License</a></p>
 
 </div>
@@ -218,15 +217,15 @@
 		<dt>controlType</dt>
 			<dd><em>Default: 'slider'</em> - Whether to use 'slider' or 'select'. If 'slider' is unavailable through jQueryUI, 'select' will be used. For advanced usage you may pass an object which implements "create", "options", "value" methods to use controls other than sliders or selects.  See the _controls property in the source code for more details.
 <pre>{
-create: function(tp_inst, obj, unit, val, min, max, step){	
-// generate whatever controls you want here, just return obj
-},
-options: function(tp_inst, obj, unit, opts, val){
-// if val==undefined return the value, else return obj
-},
-value: function(tp_inst, obj, unit, val){
-// if val==undefined return the value, else return obj
-}
+	create: function(tp_inst, obj, unit, val, min, max, step){	
+		// generate whatever controls you want here, just return obj
+	},
+	options: function(tp_inst, obj, unit, opts, val){
+		// if val==undefined return the value, else return obj
+	},
+	value: function(tp_inst, obj, unit, val){
+		// if val==undefined return the value, else return obj
+	}
 }</pre>
 			</dd>
 
@@ -374,12 +373,12 @@ value: function(tp_inst, obj, unit, val){
 		<dt>parse</dt>
 			<dd><em>Default: 'strict'</em> - How to parse the time string.  Two methods are provided: 'strict' which must match the timeFormat exactly, and 'loose' which uses javascript's new Date(timeString) to guess the time.  You may also pass in a function(timeFormat, timeString, options) to handle the parsing yourself, returning a simple object: 
 <pre>{
-hour: 19,
-minute: 10,
-second: 23,
-millisec: 45,
-microsec: 23,
-timezone: '-0400'
+	hour: 19,
+	minute: 10,
+	second: 23,
+	millisec: 45,
+	microsec: 23,
+	timezone: '-0400'
 }</pre>
 			</dd>
 	</dl>
diff --git a/dist/jquery-ui-timepicker-addon.js b/dist/jquery-ui-timepicker-addon.js
index a9b0597..85f5016 100644
--- a/dist/jquery-ui-timepicker-addon.js
+++ b/dist/jquery-ui-timepicker-addon.js
@@ -1,8 +1,6 @@
 /*! jQuery Timepicker Addon - v1.3.2 - 2013-07-29
 * http://trentrichardson.com/examples/timepicker
 * Copyright (c) 2013 Trent Richardson; Licensed MIT */
-/*jslint evil: true, white: false, undef: false */
-
 (function ($) {
 
 	/*
diff --git a/src/docs/intro.html b/src/docs/intro.html
index 1369355..88010f5 100644
--- a/src/docs/intro.html
+++ b/src/docs/intro.html
@@ -52,8 +52,7 @@
 	<p>Version 1.3.2</p>
 
 	<p>Last updated on 07/07/2013</p>
-	<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under both MIT and GPL licenses. This means that you can choose the license that best suits your project, and use it accordingly. </p>
-	<p><a href="http://trentrichardson.com/Impromptu/GPL-LICENSE.txt" title="GPL License">GPL License</a></p>
+	<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under the MIT license.</p>
 	<p><a href="http://trentrichardson.com/Impromptu/MIT-LICENSE.txt" title="MIT License">MIT License</a></p>
 
 </div>
diff --git a/src/docs/options.html b/src/docs/options.html
index 583426c..4c62358 100644
--- a/src/docs/options.html
+++ b/src/docs/options.html
@@ -83,15 +83,15 @@
 		<dt>controlType</dt>
 			<dd><em>Default: 'slider'</em> - Whether to use 'slider' or 'select'. If 'slider' is unavailable through jQueryUI, 'select' will be used. For advanced usage you may pass an object which implements "create", "options", "value" methods to use controls other than sliders or selects.  See the _controls property in the source code for more details.
 <pre>{
-create: function(tp_inst, obj, unit, val, min, max, step){	
-// generate whatever controls you want here, just return obj
-},
-options: function(tp_inst, obj, unit, opts, val){
-// if val==undefined return the value, else return obj
-},
-value: function(tp_inst, obj, unit, val){
-// if val==undefined return the value, else return obj
-}
+	create: function(tp_inst, obj, unit, val, min, max, step){	
+		// generate whatever controls you want here, just return obj
+	},
+	options: function(tp_inst, obj, unit, opts, val){
+		// if val==undefined return the value, else return obj
+	},
+	value: function(tp_inst, obj, unit, val){
+		// if val==undefined return the value, else return obj
+	}
 }</pre>
 			</dd>
 
@@ -239,12 +239,12 @@ value: function(tp_inst, obj, unit, val){
 		<dt>parse</dt>
 			<dd><em>Default: 'strict'</em> - How to parse the time string.  Two methods are provided: 'strict' which must match the timeFormat exactly, and 'loose' which uses javascript's new Date(timeString) to guess the time.  You may also pass in a function(timeFormat, timeString, options) to handle the parsing yourself, returning a simple object: 
 <pre>{
-hour: 19,
-minute: 10,
-second: 23,
-millisec: 45,
-microsec: 23,
-timezone: '-0400'
+	hour: 19,
+	minute: 10,
+	second: 23,
+	millisec: 45,
+	microsec: 23,
+	timezone: '-0400'
 }</pre>
 			</dd>
 	</dl>
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js
index 38ddb4b..eade9b9 100644
--- a/src/jquery-ui-timepicker-addon.js
+++ b/src/jquery-ui-timepicker-addon.js
@@ -1,12 +1,9 @@
 /*
- * jQuery timepicker addon
+ * jQuery Timepicker Addon
  * By: Trent Richardson [http://trentrichardson.com]
- * Version 1.3.2-dev
- * Last Modified: 07/07/2013
  *
  * Copyright 2013 Trent Richardson
- * You may use this project under MIT or GPL licenses.
- * http://trentrichardson.com/Impromptu/GPL-LICENSE.txt
+ * You may use this project under MIT license.
  * http://trentrichardson.com/Impromptu/MIT-LICENSE.txt
  */