jquery-keypad-rails 1.5.1 → 2.0.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDZhZWUxY2RmZGZlOTNjYWNkMzA2Yjg0OGE3OTIwZTM2ZWUwYjc1OA==
+    YjNlZjYyZmZmYzcwYjkyZWI4ZmJmNmFlMWQ3NjQ0NjI4MTdjNzk0MQ==
   data.tar.gz: !binary |-
-    ZDBjOTg5MzM2NzgxMDdlZWM4MjJmOWMyMjExNDllYzBjMDc5NmFiYw==
+    ZmNhMGJkZDRkMGIwMTA1YjIzYWE3OWE0ZWQ0YWRjZGQyNDMyMzgyZg==
 SHA512:
   metadata.gz: !binary |-
-    YmU3YmQ2MDE5OWU4NmFkMTQzMDU1MzI2MmU5OWFiMTdiZjcxMTk1ZTUyOTg1
-    YTZjZjBkYmM4MWEzN2I1M2ExYzYyYTFiOGE0MzFlN2U3ZjNjZTI5YWFmYWIw
-    ZTgwZjYxY2RhNjU3ZDBjNGEzNjU2YzEzNGQ1YjY3N2RjZjQ2Mzg=
+    YjgxMmQ1Zjg5YTY4OGY2YzUwZTY5NjUyYjdkYTkyZWVmZjY0ZTIzNGQ1MDAw
+    ZmU1NGVjNDE4OTdlYTk3NTNmMzgxMzQ3ZmM4MTAwNzVjMmY1MDJhZTAzY2Rl
+    NmUzOTgxYzY0YzNlYjdiYWYwYTVkOTcwNzMwZjFjOTdjMjA2NWI=
   data.tar.gz: !binary |-
-    ZWQ1MGZhZDM4Mjc3NTJhN2E3ZGU2MzM4ZGNkNjI2ZjAyMmE0N2I1ZTBjMWE2
-    OWQwMzQ5ODgwYjViOTc3MmE1N2ZiYjVhNjgxZmE5ZDc5NmNiZGI4YmMxN2Yz
-    OGNiYTViNzMyMTkyMzFkZDZhN2Q3MWY4MGY0NzBiMmJjMzc1YWE=
+    ZjRmZGViNzAyNjIwZTM4ZmQ2ODdhMTZhZjE0MzAwMmY0NDU4NDZjZWNkMmJh
+    MzI3MzQ5N2JlODdkNzAyZWFiNTc3OTI5ZDA4MmM1Y2MzODlhZGFmYmNmZTQx
+    ODMzZjE5OTNjMTRkNGRmYjUzMjY0NjQ2M2JkNjEyZjM2OTY5NzA=

data/README.md

@@ -20,7 +20,11 @@ Or install it yourself as:
 
 ## Usage
 
-No helpers at this time, maybe in the future or from a contributor?
+Add to your 'application.js'
+
+  //= require jquery.plugin
+  //= require jquery.keypad
+
 
 ## Contributing
 

data/build.me

@@ -1,6 +1,7 @@
 #!/bin/bash 
 
-VER=1.5.1
+VER=2.0.0
+REV=.1
 
 rm build/*
 pushd build
@@ -19,13 +20,15 @@ cat >lib/jquery/keypad/rails/version.rb <<EOF
 module Jquery
   module Keypad
     module Rails
-      VERSION = "${VER}"
+      VERSION = "${VER}${REV}"
     end
   end
 end
 EOF
 
+git commit -a
+
 gem update --system
 gem build jquery-keypad-rails.gemspec
-gem push jquery-keypad-rails-${VER}.gem
+# gem push jquery-keypad-rails-${VER}.gem
 

data/jquery-keypad-rails.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.add_runtime_dependency 'jquery-plugins-rails', '~> 0.2', '>= 0.2.1'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/jquery/keypad/rails/version.rb

@@ -1,7 +1,7 @@
 module Jquery
   module Keypad
     module Rails
-      VERSION = "1.5.1"
+      VERSION = "2.0.0.1"
     end
   end
 end

data/vendor/assets/javascripts/jquery.keypad-ca.js

@@ -2,7 +2,7 @@
    Catalan initialisation for the jQuery keypad extension
    Written by Ignasi Nogues (inogues@clickartedu.com). */
 (function($) { // hide the namespace
-	$.keypad.regional['ca'] = {
+	$.keypad.regionalOptions['ca'] = {
 		buttonText: '...', buttonStatus: 'Obrir el teclat',
 		closeText: 'Tancar', closeStatus: 'Tancar el teclat',
 		clearText: 'Netejar', clearStatus: 'Eliminar tot el text',
@@ -17,5 +17,5 @@
 		isNumeric: $.keypad.isNumeric,
 		toUpper: $.keypad.toUpper,
 		isRTL: false};
-	$.keypad.setDefaults($.keypad.regional['ca']);
+	$.keypad.setDefaults($.keypad.regionalOptions['ca']);
 })(jQuery);

data/vendor/assets/javascripts/jquery.keypad-cs.js

@@ -2,7 +2,7 @@
    Czech initialisation for the jQuery keypad extension
    Written by Amadeo Mareš. */
 (function($) { // hide the namespace
-    $.keypad.regional['cs'] = {
+    $.keypad.regionalOptions['cs'] = {
         buttonText: '...', buttonStatus: 'Otevřít',
         closeText: 'Zavřít', closeStatus: 'Zavře klávesnici',
         clearText: 'Vymazat', clearStatus: 'Smaže text',
@@ -17,5 +17,5 @@
         isNumeric: $.keypad.isNumeric,
 		toUpper: $.keypad.toUpper,
         isRTL: false};
-    $.keypad.setDefaults($.keypad.regional['cs']);
+    $.keypad.setDefaults($.keypad.regionalOptions['cs']);
 })(jQuery);

data/vendor/assets/javascripts/jquery.keypad-de.js

@@ -16,7 +16,7 @@
 		$.keypad.SHIFT + $.keypad.SPACE + $.keypad.SPACE_BAR +
 		$.keypad.SPACE + $.keypad.SPACE + $.keypad.SPACE + $.keypad.CLEAR +
 		$.keypad.SPACE + $.keypad.SPACE + $.keypad.HALF_SPACE + $.keypad.CLOSE];
-	$.keypad.regional['de'] = {
+	$.keypad.regionalOptions['de'] = {
 		buttonText: '...', buttonStatus: 'Öffnen',
 		closeText: 'schließen', closeStatus: 'schließen',
 		clearText: 'löschen', clearStatus: 'Gesamten Inhalt löschen',
@@ -31,6 +31,6 @@
 		isNumeric: $.keypad.isNumeric,
 		toUpper: $.keypad.toUpper,
 		isRTL: false};
-	$.keypad.setDefaults($.keypad.regional['de']);
+	$.keypad.setDefaults($.keypad.regionalOptions['de']);
 
 })(jQuery);

data/vendor/assets/javascripts/jquery.keypad-es.js

@@ -2,7 +2,7 @@
    Spanish initialisation for the jQuery keypad extension
    Written by Cristhian Benitez (cbenitez@gmail.com). */
 (function($) { // hide the namespace
-	$.keypad.regional['es'] = {
+	$.keypad.regionalOptions['es'] = {
 		buttonText: '...', buttonStatus: 'Abrir el teclado',
 		closeText: 'Cerrar', closeStatus: 'Cerrar el teclado',
 		clearText: 'Limpiar', clearStatus: 'Eliminar todo el texto',
@@ -17,5 +17,5 @@
 		isNumeric: $.keypad.isNumeric,
 		toUpper: $.keypad.toUpper,
 		isRTL: false};
-	$.keypad.setDefaults($.keypad.regional['es']);
+	$.keypad.setDefaults($.keypad.regionalOptions['es']);
 })(jQuery);

data/vendor/assets/javascripts/jquery.keypad-fr.js

@@ -12,7 +12,7 @@
 		'§' + $.keypad.azertyAlphabetic[3] + ',.;:' + $.keypad.HALF_SPACE + '-0+',
 		$.keypad.SHIFT + $.keypad.SPACE_BAR + $.keypad.HALF_SPACE +
 		$.keypad.BACK + $.keypad.CLEAR + $.keypad.CLOSE];
-	$.keypad.regional['fr'] = {
+	$.keypad.regionalOptions['fr'] = {
 		buttonText: '...', buttonStatus: 'Ouvrir',
 		closeText: 'Fermer', closeStatus: 'Fermer le pavé numérique',
 		clearText: 'Effacer', clearStatus: 'Effacer la valeur',
@@ -27,7 +27,7 @@
 		isNumeric: $.keypad.isNumeric,
 		toUpper: $.keypad.toUpper,
 		isRTL: false};
-	$.keypad.setDefaults($.keypad.regional['fr']);
+	$.keypad.setDefaults($.keypad.regionalOptions['fr']);
 
 	function isAlphabetic(ch) {
 		return ($.keypad.isAlphabetic(ch) ||

data/vendor/assets/javascripts/jquery.keypad-it.js

@@ -2,7 +2,7 @@
    Italian initialisation for the jQuery keypad extension
    Written by Francesco Strappini (www.strx.it). */
 (function($) { // hide the namespace
-	$.keypad.regional['it'] = {
+	$.keypad.regionalOptions['it'] = {
 		buttonText: '...', buttonStatus: 'Visualizza Tastiera',
 		closeText: 'Chiudi', closeStatus: 'Nascondi Tastiera',
 		clearText: 'Pulisci', clearStatus: 'Elimina il Testo',
@@ -17,5 +17,5 @@
 		isNumeric: $.keypad.isNumeric,
 		toUpper: $.keypad.toUpper,
 		isRTL: false};
-	$.keypad.setDefaults($.keypad.regional['it']);
+	$.keypad.setDefaults($.keypad.regionalOptions['it']);
 })(jQuery);

data/vendor/assets/javascripts/jquery.keypad-nl.js

@@ -2,7 +2,7 @@
    dutch initialisation for the jQuery keypad extension
    Written by Michiel Mussies (mail{at}webcrafts.nl) November 2009. */
 (function($) { // hide the namespace
-    $.keypad.regional['nl'] = {
+    $.keypad.regionalOptions['nl'] = {
         buttonText: '...', buttonStatus: 'Open',
         closeText: 'Sluit', closeStatus: 'Sluit',
         clearText: 'Wissen', clearStatus: 'Wis alle tekens',
@@ -17,5 +17,5 @@
         isNumeric: $.keypad.isNumeric,
 		toUpper: $.keypad.toUpper,
         isRTL: false};
-    $.keypad.setDefaults($.keypad.regional['nl']);
+    $.keypad.setDefaults($.keypad.regionalOptions['nl']);
 })(jQuery);

data/vendor/assets/javascripts/jquery.keypad-pt-BR.js

@@ -2,7 +2,7 @@
    brazilian portuguese initialisation for the jQuery keypad extension
    Written by Israel Rodriguez (yzraeu{at}gmail.com) July 2009. */
 (function($) { // hide the namespace
-    $.keypad.regional['pt-BR'] = {
+    $.keypad.regionalOptions['pt-BR'] = {
         buttonText: '...', buttonStatus: 'Abrir o teclado',
         closeText: 'Fechar', closeStatus: 'Fechar o teclado',
         clearText: 'Limpar', clearStatus: 'Limpar todo o texto',
@@ -17,5 +17,5 @@
         isNumeric: $.keypad.isNumeric,
 		toUpper: $.keypad.toUpper,
         isRTL: false};
-    $.keypad.setDefaults($.keypad.regional['pt-BR']);
+    $.keypad.setDefaults($.keypad.regionalOptions['pt-BR']);
 })(jQuery);

data/vendor/assets/javascripts/jquery.keypad-sk.js

@@ -0,0 +1,21 @@
+/* http://keith-wood.name/keypad.html
+   Slovak initialisation for the jQuery keypad extension
+   Written by Peter Čáni - inac.sk. */
+(function($) { // hide the namespace
+	$.keypad.regionalOptions['sk'] = {
+		buttonText: '...', buttonStatus: 'Otvoriť',
+		closeText: 'Zatvoriť', closeStatus: 'Zatvoriť klávesnicu',
+		clearText: 'Vymazať', clearStatus: 'Vymazať text',
+		backText: 'Vymazať', backStatus: 'Vymazať posledné písmeno',
+		shiftText: 'Veľkosť', shiftStatus: 'Nastaví veľké/malé písmená',
+		spacebarText: ' ', spacebarStatus: '',
+		enterText: 'Enter', enterStatus: '',
+		tabText: '→', tabStatus: '',
+		alphabeticLayout: $.keypad.qwertyAlphabetic,
+		fullLayout: $.keypad.qwertyLayout,
+		isAlphabetic: $.keypad.isAlphabetic,
+		isNumeric: $.keypad.isNumeric,
+		toUpper: $.keypad.toUpper,
+		isRTL: false};
+	$.keypad.setDefaults($.keypad.regionalOptions['sk']);
+})(jQuery);

data/vendor/assets/javascripts/jquery.keypad-tr.js

@@ -2,7 +2,7 @@
    Turkish localisation for the jQuery keypad extension
    Written by Yücel Kandemir(yucel{at}21bilisim.com) September 2010. */
 (function($) { // hide the namespace
-	$.keypad.regional['tr'] = {
+	$.keypad.regionalOptions['tr'] = {
 		buttonText: '...', buttonStatus: 'Aç',
 		closeText: 'Kapat', closeStatus: 'Klavyeyi Kapatýr',
 		clearText: 'Sil', clearStatus: 'Ýçerisini Temizler',
@@ -17,5 +17,5 @@
 	    isNumeric: $.keypad.isNumeric,
 		toUpper: $.keypad.toUpper,
     	isRTL: false};
-	$.keypad.setDefaults($.keypad.regional['tr']);
+	$.keypad.setDefaults($.keypad.regionalOptions['tr']);
 })(jQuery);

data/vendor/assets/javascripts/jquery.keypad.js

@@ -1,132 +1,216 @@
 /* http://keith-wood.name/keypad.html
-   Keypad field entry extension for jQuery v1.5.1.
+   Keypad field entry extension for jQuery v2.0.0.
    Written by Keith Wood (kbwood{at}iinet.com.au) August 2008.
    Available under the MIT (https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) license. 
    Please attribute the author if you use it. */
    
 (function($) { // hide the namespace
 
-/* Keypad manager.
-   Use the singleton instance of this class, $.keypad, to interact with the plugin.
-   Settings for keypad fields are maintained in instance objects,
-   allowing multiple different settings on the same page. */
-function Keypad() {
-	this._curInst = null; // The current instance in use
-	this._disabledFields = []; // List of keypad fields that have been disabled
-	this._keypadShowing = false; // True if the popup panel is showing , false if not
-	this._keyCode = 0;
-	this._specialKeys = [];
-	this.addKeyDef('CLOSE', 'close', function(inst) {
-		plugin._curInst = (inst._inline ? inst : plugin._curInst);
-		plugin._hidePlugin();
-	});
-	this.addKeyDef('CLEAR', 'clear', function(inst) { plugin._clearValue(inst); });
-	this.addKeyDef('BACK', 'back', function(inst) { plugin._backValue(inst); });
-	this.addKeyDef('SHIFT', 'shift', function(inst) { plugin._shiftKeypad(inst); });
-	this.addKeyDef('SPACE_BAR', 'spacebar', function(inst) { plugin._selectValue(inst, ' '); }, true);
-	this.addKeyDef('SPACE', 'space');
-	this.addKeyDef('HALF_SPACE', 'half-space');
-	this.addKeyDef('ENTER', 'enter', function(inst) { plugin._selectValue(inst, '\x0D'); }, true);
-	this.addKeyDef('TAB', 'tab', function(inst) { plugin._selectValue(inst, '\x09'); }, true);
+	var pluginName = 'keypad';
+	
+	var layoutStandard = ['  BSCECA', '_1_2_3_+@X', '_4_5_6_-@U', '_7_8_9_*@E', '_0_._=_/'];
+
+	/** Create the keypad plugin.
+		<p>Sets an input field to popup a keypad for keystroke entry,
+			or creates an inline keypad in a <code>div</code> or <code>span</code>.</p>
+		<p>Expects HTML like:</p>
+		<pre>&lt;input type="text"> or
+&lt;div&gt;&lt;/div&gt;</pre>
+		<p>Provide inline configuration like:</p>
+		<pre>&lt;input type="text" data-keypad="name: 'value'"/></pre>
+	 	@module Keypad
+		@augments JQPlugin
+		@example $(selector).keypad() */
+	$.JQPlugin.createPlugin({
+	
+		/** The name of the plugin. */
+		name: pluginName,
+			
+		/** Keypad before show callback.
+			Triggered before the keypad is shown.
+			@callback beforeShowCallback
+			@param div {jQuery} The div to be shown.
+			@param inst {object} The current instance settings. */
+			
+		/** Keypad on keypress callback.
+			Triggered when a key on the keypad is pressed.
+			@callback keypressCallback
+			@param key {string} The key just pressed.
+			@param value {string} The full value entered so far.
+			@param inst {object} The current instance settings. */
+			
+		/** Keypad on close callback.
+			Triggered when the keypad is closed.
+			@callback closeCallback
+			@param value {string} The full value entered so far.
+			@param inst {object} The current instance settings. */
+			
+		/** Keypad is alphabetic callback.
+			Triggered when an alphabetic key needs to be identified.
+			@callback isAlphabeticCallback
+			@param ch {string} The key to check.
+			@return {boolean} True if this key is alphabetic, false if not.
+			@example isAlphabetic: function(ch) {
+	return (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z');
+ } */
+			
+		/** Keypad is numeric callback.
+			Triggered when an numeric key needs to be identified.
+			@callback isNumericCallback
+			@param ch {string} The key to check.
+			@return {boolean} True if this key is numeric, false if not.
+			@example isNumeric: function(ch) {
+	return (ch >= '0' && ch <= '9');
+ } */
+			
+		/** Keypad to upper callback.
+			Triggered to convert keys to upper case.
+			@callback toUpperCallback
+			@param ch {string} The key to convert.
+			@return {string} The upper case version of this key.
+			@example toUpper: function(ch) {
+	return ch.toUpperCase();
+ } */
+			
+		/** Default settings for the plugin.
+			@property [showOn='focus'] {string} 'focus' for popup on focus, 'button' for trigger button, or 'both' for either.
+			@property [buttonImage=''] {string} URL for trigger button image.
+			@property [buttonImageOnly=false] {boolean} True if the image appears alone, false if it appears on a button.
+			@property [showAnim='show'] {string} Name of jQuery animation for popup.
+			@property [showOptions=null] {object} Options for enhanced animations.
+			@property [duration='normal'] {string|number} Duration of display/closure.
+			@property [appendText=''] {string} Display text following the text field, e.g. showing the format.
+			@property [useThemeRoller=false] {boolean} True to add ThemeRoller classes.
+			@property [keypadClass=''] {string} Additional CSS class for the keypad for an instance.
+			@property [prompt=''] {string} Display text at the top of the keypad.
+			@property [layout=this.numericLayout] {string} Layout of keys.
+			@property [separator=''] {string} Separator character between keys.
+			@property [target=null] {string|jQuery|Element} Input target for an inline keypad.
+			@property [keypadOnly=true] {boolean} True for entry only via the keypad, false for real keyboard too.
+			@property [randomiseAlphabetic=false] {boolean} True to randomise the alphabetic key positions, false to keep in order.
+			@property [randomiseNumeric=false] {boolean} True to randomise the numeric key positions, false to keep in order.
+			@property [randomiseOther=false] {boolean} True to randomise the other key positions, false to keep in order.
+			@property [randomiseAll=false] {boolean} True to randomise all key positions, false to keep in order.
+			@property [beforeShow=null] {beforeShowCallback} Callback before showing the keypad.
+			@property [onKeypress=null] {keypressCallback} Callback when a key is selected.
+			@property [onClose=null] {closeCallback} Callback when the panel is closed. */
+		defaultOptions: {
+			showOn: 'focus',
+			buttonImage: '',
+			buttonImageOnly: false,
+			showAnim: 'show',
+			showOptions: null,
+			duration: 'normal',
+			appendText: '',
+			useThemeRoller: false,
+			keypadClass: '',
+			prompt: '',
+			layout: [], // Set at the end
+			separator: '',
+			target: null,
+			keypadOnly: true,
+			randomiseAlphabetic: false,
+			randomiseNumeric: false,
+			randomiseOther: false,
+			randomiseAll: false,
+			beforeShow: null,
+			onKeypress: null,
+			onClose: null
+		},
+
+		/** Localisations for the plugin.
+			Entries are objects indexed by the language code ('' being the default US/English).
+			Each object has the following attributes.
+			@property [buttonText='...'] {string} Display text for trigger button.
+			@property [buttonStatus='Open the keypad'] {string} Status text for trigger button.
+			@property [closeText='Close'] {string} Display text for close link.
+			@property [closeStatus='Close the keypad'] {string} Status text for close link.
+			@property [clearText='Clear'] {string} Display text for clear link.
+			@property [clearStatus='Erase all the text'] {string} Status text for clear link.
+			@property [backText='Back'] {string} Display text for back link.
+			@property [backStatus='Erase the previous character'] {string} Status text for back link.
+			@property [spacebarText='&nbsp;'] {string} Display text for space bar.
+			@property [spacebarStatus='Space'] {string} Status text for space bar.
+			@property [enterText='Enter'] {string} Display text for carriage return.
+			@property [enterStatus='Carriage return'] {string} Status text for carriage return.
+			@property [tabText='→'] {string} Display text for tab.
+			@property [tabStatus='Horizontal tab'] {string} Status text for tab.
+			@property [shiftText='Shift'] {string} Display text for shift link.
+			@property [shiftStatus='Toggle upper/lower case characters'] {string} Status text for shift link.
+			@property [alphabeticLayout=this.qwertyAlphabetic] {string} Default layout for alphabetic characters.
+			@property [fullLayout=this.qwertyLayout] {string} Default layout for full keyboard.
+			@property [isAlphabetic=this.isAlphabetic] {isAlphabeticCallback} Function to determine if character is alphabetic.
+			@property [isNumeric=this.isNumeric] {isNumericCallback} Function to determine if character is numeric.
+			@property [toUpper=this.toUpper] {toUpperCallback} Function to convert characters to upper case.
+			@property [isRTL=false] {boolean} True if right-to-left language, false if left-to-right. */
+		regionalOptions: { // Available regional settings, indexed by language/country code
+			'': { // Default regional settings - English/US
+				buttonText: '...',
+				buttonStatus: 'Open the keypad',
+				closeText: 'Close',
+				closeStatus: 'Close the keypad',
+				clearText: 'Clear',
+				clearStatus: 'Erase all the text',
+				backText: 'Back',
+				backStatus: 'Erase the previous character',
+				spacebarText: '&nbsp;',
+				spacebarStatus: 'Space',
+				enterText: 'Enter',
+				enterStatus: 'Carriage return',
+				tabText: '→',
+				tabStatus: 'Horizontal tab',
+				shiftText: 'Shift',
+				shiftStatus: 'Toggle upper/lower case characters',
+				alphabeticLayout: [], // Set at the end
+				fullLayout: [],
+				isAlphabetic: null,
+				isNumeric: null,
+				toUpper: null,
+				isRTL: false
+			}
+		},
+		
+		/** Names of getter methods - those that can't be chained. */
+		_getters: ['isDisabled'],
+
+		_curInst: null, // The current instance in use
+		_disabledFields: [], // List of keypad fields that have been disabled
+		_keypadShowing: false, // True if the popup panel is showing , false if not
+		_keyCode: 0,
+		_specialKeys: [],
+		
+		_mainDivClass: pluginName + '-popup', // The main keypad division class
+		_inlineClass: pluginName + '-inline', // The inline marker class
+		_appendClass: pluginName + '-append', // The append marker class
+		_triggerClass: pluginName + '-trigger', // The trigger marker class
+		_disableClass: pluginName + '-disabled', // The disabled covering marker class
+		_inlineEntryClass: pluginName + '-keyentry', // The inline entry marker class
+		_rtlClass: pluginName + '-rtl', // The right-to-left marker class
+		_rowClass: pluginName + '-row', // The keypad row marker class
+		_promptClass: pluginName + '-prompt', // The prompt marker class
+		_specialClass: pluginName + '-special', // The special key marker class
+		_namePrefixClass: pluginName + '-', // The key name marker class prefix
+		_keyClass: pluginName + '-key', // The key marker class
+		_keyDownClass: pluginName + '-key-down', // The key down marker class
+
 	// Standard US keyboard alphabetic layout
-	this.qwertyAlphabetic = ['qwertyuiop', 'asdfghjkl', 'zxcvbnm'];
+		qwertyAlphabetic: ['qwertyuiop', 'asdfghjkl', 'zxcvbnm'],
 	// Standard US keyboard layout
-	this.qwertyLayout = ['!@#$%^&*()_=' + this.HALF_SPACE + this.SPACE + this.CLOSE,
+		qwertyLayout: ['!@#$%^&*()_=' + this.HALF_SPACE + this.SPACE + this.CLOSE,
 		this.HALF_SPACE + '`~[]{}<>\\|/' + this.SPACE + '789',
 		'qwertyuiop\'"' + this.HALF_SPACE + '456',
 		this.HALF_SPACE + 'asdfghjkl;:' + this.SPACE + '123',
 		this.SPACE + 'zxcvbnm,.?' + this.SPACE + this.HALF_SPACE + '-0+',
 		'' + this.TAB + this.ENTER + this.SPACE_BAR + this.SHIFT +
-		this.HALF_SPACE + this.BACK + this.CLEAR];
-	this.regional = []; // Available regional settings, indexed by language code
-	this.regional[''] = { // Default regional settings
-		buttonText: '...', // Display text for trigger button
-		buttonStatus: 'Open the keypad', // Status text for trigger button
-		closeText: 'Close', // Display text for close link
-		closeStatus: 'Close the keypad', // Status text for close link
-		clearText: 'Clear', // Display text for clear link
-		clearStatus: 'Erase all the text', // Status text for clear link
-		backText: 'Back', // Display text for back link
-		backStatus: 'Erase the previous character', // Status text for back link
-		spacebarText: '&nbsp;', // Display text for space bar
-		spacebarStatus: 'Space', // Status text for space bar
-		enterText: 'Enter', // Display text for carriage return
-		enterStatus: 'Carriage return', // Status text for carriage return
-		tabText: '→', // Display text for tab
-		tabStatus: 'Horizontal tab', // Status text for tab
-		shiftText: 'Shift', // Display text for shift link
-		shiftStatus: 'Toggle upper/lower case characters', // Status text for shift link
-		alphabeticLayout: this.qwertyAlphabetic, // Default layout for alphabetic characters
-		fullLayout: this.qwertyLayout, // Default layout for full keyboard
-		isAlphabetic: this.isAlphabetic, // Function to determine if character is alphabetic
-		isNumeric: this.isNumeric, // Function to determine if character is numeric
-		toUpper: this.toUpper, // Function to convert characters to upper case
-		isRTL: false // True if right-to-left language, false if left-to-right
-	};
-	this._defaults = { // Global defaults for all the keypad instances
-		showOn: 'focus', // 'focus' for popup on focus,
-			// 'button' for trigger button, or 'both' for either
-		buttonImage: '', // URL for trigger button image
-		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
-		showAnim: 'show', // Name of jQuery animation for popup
-		showOptions: {}, // Options for enhanced animations
-		duration: 'normal', // Duration of display/closure
-		appendText: '', // Display text following the text field, e.g. showing the format
-		useThemeRoller: false, // True to add ThemeRoller classes
-		keypadClass: '', // Additional CSS class for the keypad for an instance
-		prompt: '', // Display text at the top of the keypad
-		layout: ['123' + this.CLOSE, '456' + this.CLEAR, '789' + this.BACK, this.SPACE + '0'], // Layout of keys
-		separator: '', // Separator character between keys
-		target: null, // Input target for an inline keypad
-		keypadOnly: true, // True for entry only via the keypad, false for real keyboard too
-		randomiseAlphabetic: false, // True to randomise the alphabetic key positions, false to keep in order
-		randomiseNumeric: false, // True to randomise the numeric key positions, false to keep in order
-		randomiseOther: false, // True to randomise the other key positions, false to keep in order
-		randomiseAll: false, // True to randomise all key positions, false to keep in order
-		beforeShow: null, // Callback before showing the keypad
-		onKeypress: null, // Callback when a key is selected
-		onClose: null // Callback when the panel is closed
-	};
-	$.extend(this._defaults, this.regional['']);
-	this.mainDiv = $('<div class="' + this._mainDivClass + '" style="display: none;"></div>');
-}
-
-$.extend(Keypad.prototype, {
-	/* Class name added to elements to indicate already configured with keypad. */
-	markerClassName: 'hasKeypad',
-	/* Name of the data property for instance settings. */
-	propertyName: 'keypad',
-
-	_mainDivClass: 'keypad-popup', // The main keypad division class
-	_inlineClass: 'keypad-inline', // The inline marker class
-	_appendClass: 'keypad-append', // The append marker class
-	_triggerClass: 'keypad-trigger', // The trigger marker class
-	_disableClass: 'keypad-disabled', // The disabled covering marker class
-	_inlineEntryClass: 'keypad-keyentry', // The inline entry marker class
-	_rtlClass: 'keypad-rtl', // The right-to-left marker class
-	_rowClass: 'keypad-row', // The keypad row marker class
-	_promptClass: 'keypad-prompt', // The prompt marker class
-	_specialClass: 'keypad-special', // The special key marker class
-	_namePrefixClass: 'keypad-', // The key name marker class prefix
-	_keyClass: 'keypad-key', // The key marker class
-	_keyDownClass: 'keypad-key-down', // The key down marker class
-
-	/* Override the default settings for all keypad instances.
-	   @param  settings  (object) the new settings to use as defaults
-	   @return  (Keypad) this object */
-	setDefaults: function(settings) {
-		$.extend(this._defaults, settings || {});
-		return this;
-	},
-
-	/* Add the definition of a special key.
-	   @param  id           (string) the identifier for this key - access via $.keypad.<id>
-	   @param  name         (string) the prefix for localisation strings and
-	                        the suffix for a class name
-	   @param  action       (function) the action performed for this key -
-	                        receives inst as a parameter
-	   @param  noHighlight  (boolean) true to suppress highlight when using ThemeRoller
-	   @return  (Keypad) this object */
+			this.HALF_SPACE + this.BACK + this.CLEAR],
+
+		/** Add the definition of a special key.
+			@param id {string} The identifier for this key - access via <code>$.keypad.xxx</code>.<id>.
+			@param name {string} The prefix for localisation strings and the suffix for a class name.
+			@param action {function} The action performed for this key - receives <code>inst</code> as a parameter.
+			@param noHighlight {boolean} True to suppress highlight when using ThemeRoller.
+			@return {Keypad} The keypad object for chaining further calls.
+			@example $.keypad.addKeyDef('CLEAR', 'clear', function(inst) { plugin._clearValue(inst); }); */
 	addKeyDef: function(id, name, action, noHighlight) {
 		if (this._keyCode == 32) {
 			throw 'Only 32 special keys allowed';
@@ -137,59 +221,60 @@ $.extend(Keypad.prototype, {
 		return this;
 	},
 
-	/* Attach the keypad to a jQuery selection.
-	   @param  target   (element) the control to affect
-	   @param  options  (object) the custom options for this instance */
-	_attachPlugin: function(target, options) {
-		target = $(target);
-		if (target.hasClass(this.markerClassName)) {
-			return;
-		}
-		var inline = !target[0].nodeName.toLowerCase().match(/input|textarea/);
-		var inst = {options: $.extend({}, this._defaults, options), _inline: inline,
-			_mainDiv: (inline ? $('<div class="' + this._inlineClass + '"></div>') : plugin.mainDiv),
-			ucase: false};
-		this._setInput(target, inst);
-		this._connectKeypad(target, inst);
-		if (inline) {
-			target.append(inst._mainDiv).
-				bind('click.' + this.propertyName, function() { inst._input.focus(); });
+		/** Additional setup for the keypad.
+			Create popup div. */
+		_init: function() {
+			this.mainDiv = $('<div class="' + this._mainDivClass + '" style="display: none;"></div>');
+			this._super();
+		},
+
+		_instSettings: function(elem, options) {
+			var inline = !elem[0].nodeName.toLowerCase().match(/input|textarea/);
+			return {_inline: inline, ucase: false,
+				_mainDiv: (inline ? $('<div class="' + this._inlineClass + '"></div>') : plugin.mainDiv)};
+		},
+
+		_postAttach: function(elem, inst) {
+			if (inst._inline) {
+				elem.append(inst._mainDiv).
+					on('click.' + inst.name, function() { inst._input.focus(); });
 			this._updateKeypad(inst);
 		}
-		else if (target.is(':disabled')) {
-			this._disablePlugin(target);
+			else if (elem.is(':disabled')) {
+				this.disable(elem);
 		}
 	},
 
-	/* Determine the input field for the keypad.
-	   @param  target  (jQuery) the target control
-	   @param  inst    (object) the instance settings */
-	_setInput: function(target, inst) {
-		inst._input = $(!inst._inline ? target : inst.options.target ||
-			'<input type="text" class="' + this._inlineEntryClass + '" disabled="disabled"/>');
+		/** Determine the input field for the keypad.
+			@private
+			@param elem {jQuery} The target control.
+			@param inst {object} The instance settings. */
+		_setInput: function(elem, inst) {
+			inst._input = $(!inst._inline ? elem : inst.options.target ||
+				'<input type="text" class="' + this._inlineEntryClass + '" disabled/>');
 		if (inst._inline) {
-			target.find('input').remove();
+				elem.find('input').remove();
 			if (!inst.options.target) {
-				target.append(inst._input);
+					elem.append(inst._input);
 			}
 		}
 	},
 
-	/* Attach the keypad to a text field.
-	   @param  target  (jQuery) the target text field
-	   @param  inst    (object) the instance settings */
-	_connectKeypad: function(target, inst) {
-		target = $(target);
+		_optionsChanged: function(elem, inst, options) {
+			$.extend(inst.options, options);
+			elem.off('.' + inst.name).
+				siblings('.' + this._appendClass).remove().end().
+				siblings('.' + this._triggerClass).remove();
 		var appendText = inst.options.appendText;
 		if (appendText) {
-			target[inst.options.isRTL ? 'before' : 'after'](
+				elem[inst.options.isRTL ? 'before' : 'after'](
 				'<span class="' + this._appendClass + '">' + appendText + '</span>');
 		}
 		if (!inst._inline) {
 			if (inst.options.showOn == 'focus' || inst.options.showOn == 'both') {
 				// pop-up keypad when in the marked field
-				target.bind('focus.' + this.propertyName, this._showPlugin).
-					bind('keydown.' + this.propertyName, this._doKeyDown);
+					elem.on('focus.' + inst.name, this.show).
+						on('keydown.' + inst.name, this._doKeyDown);
 			}
 			if (inst.options.showOn == 'button' || inst.options.showOn == 'both') {
 				// pop-up keypad when button clicked
@@ -202,124 +287,80 @@ $.extend(Keypad.prototype, {
 					html(buttonImage == '' ? inst.options.buttonText :
 					$('<img src="' + buttonImage + '" alt="' +
 					buttonStatus + '" title="' + buttonStatus + '"/>')));
-				target[inst.options.isRTL ? 'before' : 'after'](trigger);
+					elem[inst.options.isRTL ? 'before' : 'after'](trigger);
 				trigger.addClass(this._triggerClass).click(function() {
-					if (plugin._keypadShowing && plugin._lastField == target[0]) {
-						plugin._hidePlugin();
+						if (plugin._keypadShowing && plugin._lastField == elem[0]) {
+							plugin.hide();
 					}
 					else {
-						plugin._showPlugin(target[0]);
+							plugin.show(elem[0]);
 					}
 					return false;
 				});
 			}
 		}
-		inst.saveReadonly = target.attr('readonly');
-		target.addClass(this.markerClassName).
-			data(this.propertyName, inst)
-			[inst.options.keypadOnly ? 'attr' : 'removeAttr']('readonly', true).
-			bind('setData.' + this.propertyName, function(event, key, value) {
+			inst.saveReadonly = elem.attr('readonly');
+			elem[inst.options.keypadOnly ? 'attr' : 'removeAttr']('readonly', true).
+				on('setData.' + inst.name, function(event, key, value) {
 				inst.options[key] = value;
-			}).bind('getData.' + this.propertyName, function(event, key) {
+				}).
+				on('getData.' + inst.name, function(event, key) {
 				return inst.options[key];
 			});
-	},
-
-	/* Retrieve or reconfigure the settings for a control.
-	   @param  target   (element) the control to affect
-	   @param  options  (object) the new options for this instance or
-	                    (string) an individual property name
-	   @param  value    (any) the individual property value (omit if options
-	                    is an object or to retrieve the value of a setting)
-	   @return  (any) if retrieving a value */
-	_optionPlugin: function(target, options, value) {
-		target = $(target);
-		var inst = target.data(this.propertyName);
-		if (!options || (typeof options == 'string' && value == null)) { // Get option
-			var name = options;
-			options = (inst || {}).options;
-			return (options && name ? options[name] : options);
-		}
-
-		if (!target.hasClass(this.markerClassName)) {
-			return;
-		}
-		options = options || {};
-		if (typeof options == 'string') {
-			var name = options;
-			options = {};
-			options[name] = value;
-		}
-		if (this._curInst == inst) {
-			this._hidePlugin();
-		}
-		$.extend(inst.options, options);
-		this._setInput(target, inst);
+			this._setInput(elem, inst);
 		this._updateKeypad(inst);
 	},
 
-	/* Detach keypad from its control.
-	   @param  target  (element) the target text field */
-	_destroyPlugin: function(target) {
-		target = $(target);
-		if (!target.hasClass(this.markerClassName)) {
-			return;
-		}
-		var inst = target.data(this.propertyName);
+		_preDestroy: function(elem, inst) {
 		if (this._curInst == inst) {
-			this._hidePlugin();
+				this.hide();
 		}
-		target.siblings('.' + this._appendClass).remove().end().
+			elem.siblings('.' + this._appendClass).remove().end().
 			siblings('.' + this._triggerClass).remove().end().
 			prev('.' + this._inlineEntryClass).remove();
-		target.removeClass(this.markerClassName).empty().
-			unbind('.' + this.propertyName).
-			removeData(this.propertyName)
+			elem.empty().off('.' + inst.name)
 			[inst.saveReadonly ? 'attr' : 'removeAttr']('readonly', true);
-		inst._input.removeData(this.propertyName);
+			inst._input.removeData(inst.name);
 	},
 
-	/* Enable the keypad for a jQuery selection.
-	   @param  target  (element) the target text field */
-	_enablePlugin: function(target) {
-		target = $(target);
-		if (!target.hasClass(this.markerClassName)) {
+		/** Enable the keypad for a jQuery selection.
+			@param elem {Element} The target text field.
+			@example $(selector).keypad('enable'); */
+		enable: function(elem) {
+			elem = $(elem);
+			if (!elem.hasClass(this._getMarker())) {
 			return;
 		}
-		var nodeName = target[0].nodeName.toLowerCase();
+			var nodeName = elem[0].nodeName.toLowerCase();
 		if (nodeName.match(/input|textarea/)) {
-			target[0].disabled = false;
-			target.siblings('button.' + this._triggerClass).
-				each(function() { this.disabled = false; }).end().
-				siblings('img.' + this._triggerClass).
-				css({opacity: '1.0', cursor: ''});
+				elem.prop('disabled', false).
+					siblings('button.' + this._triggerClass).prop('disabled', false).end().
+					siblings('img.' + this._triggerClass).css({opacity: '1.0', cursor: ''});
 		}
 		else if (nodeName.match(/div|span/)) {
-			target.children('.' + this._disableClass).remove();
-			var inst = target.data(this.propertyName);
-			inst._mainDiv.find('button').removeAttr('disabled');
+				elem.children('.' + this._disableClass).remove();
+				this._getInst(elem)._mainDiv.find('button').prop('disabled', false);
 		}
 		this._disabledFields = $.map(this._disabledFields,
-			function(value) { return (value == target[0] ? null : value); }); // delete entry
+				function(value) { return (value == elem[0] ? null : value); }); // delete entry
 	},
 
-	/* Disable the keypad for a jQuery selection.
-	   @param  target  (element) the target text field */
-	_disablePlugin: function(target) {
-		target = $(target);
-		if (!target.hasClass(this.markerClassName)) {
+		/** Disable the keypad for a jQuery selection.
+			@param elem {Element} The target text field.
+			@example $(selector).keypad('disable'); */
+		disable: function(elem) {
+			elem = $(elem);
+			if (!elem.hasClass(this._getMarker())) {
 			return;
 		}
-		var nodeName = target[0].nodeName.toLowerCase();
+			var nodeName = elem[0].nodeName.toLowerCase();
 		if (nodeName.match(/input|textarea/)) {
-			target[0].disabled = true;
-			target.siblings('button.' + this._triggerClass).
-				each(function() { this.disabled = true; }).end().
-				siblings('img.' + this._triggerClass).
-				css({opacity: '0.5', cursor: 'default'});
+				elem.prop('disabled', true).
+					siblings('button.' + this._triggerClass).prop('disabled', true).end().
+					siblings('img.' + this._triggerClass).css({opacity: '0.5', cursor: 'default'});
 		}
 		else if (nodeName.match(/div|span/)) {
-			var inline = target.children('.' + this._inlineClass);
+				var inline = elem.children('.' + this._inlineClass);
 			var offset = inline.offset();
 			var relOffset = {left: 0, top: 0};
 			inline.parents().each(function() {
@@ -328,41 +369,40 @@ $.extend(Keypad.prototype, {
 					return false;
 				}
 			});
-			target.prepend('<div class="' + this._disableClass + '" style="width: ' +
+				elem.prepend('<div class="' + this._disableClass + '" style="width: ' +
 				inline.outerWidth() + 'px; height: ' + inline.outerHeight() +
 				'px; left: ' + (offset.left - relOffset.left) +
 				'px; top: ' + (offset.top - relOffset.top) + 'px;"></div>');
-			var inst = target.data(this.propertyName);
-			inst._mainDiv.find('button').attr('disabled', 'disabled');
+				this._getInst(elem)._mainDiv.find('button').prop('disabled', true);
 		}
 		this._disabledFields = $.map(this._disabledFields,
-			function(value) { return (value == target[0] ? null : value); }); // delete entry
-		this._disabledFields[this._disabledFields.length] = target[0];
-	},
-
-	/* Is the text field disabled as a keypad?
-	   @param  target  (element) the target text field
-	   @return  (boolean) true if disabled, false if enabled */
-	_isDisabledPlugin: function(target) {
-		return (target && $.inArray(target, this._disabledFields) > -1);
-	},
-
-	/* Pop-up the keypad for a given text field.
-	   @param  field  (element) the text field attached to the keypad or
-	                  (event) if triggered by focus */
-	_showPlugin: function(field) {
-		field = field.target || field;
-		if (plugin._isDisabledPlugin(field) ||
-				plugin._lastField == field) { // already here
+				function(value) { return (value == elem[0] ? null : value); }); // delete entry
+			this._disabledFields[this._disabledFields.length] = elem[0];
+	},
+
+		/** Is the text field disabled as a keypad?
+			@param elem {Element} The target text field.
+			@return {boolean} True if disabled, false if enabled.
+			@example var disabled = $(selector).keypad('isDisabled'); */
+		isDisabled: function(elem) {
+			return (elem && $.inArray(elem, this._disabledFields) > -1);
+		},
+
+		/** Pop-up the keypad for a given text field.
+			@param elem {Element|Event} The text field attached to the keypad or event if triggered by focus.
+			@example $(selector).keypad('show'); */
+		show: function(elem) {
+			elem = elem.target || elem;
+			if (plugin.isDisabled(elem) || plugin._lastField == elem) { // already here
 			return;
 		}
-		var inst = $.data(field, plugin.propertyName);
-		plugin._hidePlugin(null, '');
-		plugin._lastField = field;
-		plugin._pos = plugin._findPos(field);
-		plugin._pos[1] += field.offsetHeight; // add the height
+			var inst = plugin._getInst(elem);
+			plugin.hide(null, '');
+			plugin._lastField = elem;
+			plugin._pos = plugin._findPos(elem);
+			plugin._pos[1] += elem.offsetHeight; // add the height
 		var isFixed = false;
-		$(field).parents().each(function() {
+			$(elem).parents().each(function() {
 			isFixed |= $(this).css('position') == 'fixed';
 			return !isFixed;
 		});
@@ -388,7 +428,7 @@ $.extend(Keypad.prototype, {
 				}
 			}
 			inst._mainDiv.data(data).show(showAnim,
-				inst.options.showOptions, duration, postProcess);
+					inst.options.showOptions || {}, duration, postProcess);
 		}
 		else {
 			inst._mainDiv[showAnim || 'show']((showAnim ? duration : 0), postProcess);
@@ -399,8 +439,9 @@ $.extend(Keypad.prototype, {
 		plugin._curInst = inst;
 	},
 
-	/* Generate the keypad content.
-	   @param  inst  (object) the instance settings */
+		/** Generate the keypad content.
+			@private
+			@param inst {object} The instance settings. */
 	_updateKeypad: function(inst) {
 		var borders = this._getBorders(inst._mainDiv);
 		inst._mainDiv.empty().append(this._generateHTML(inst)).
@@ -414,9 +455,10 @@ $.extend(Keypad.prototype, {
 		}
 	},
 
-	/* Retrieve the size of left and top borders for an element.
-	   @param  elem  (jQuery object) the element of interest
-	   @return  (number[2]) the left and top borders */
+		/** Retrieve the size of left and top borders for an element.
+			@private
+			@param elem {jQuery} The element of interest.
+			@return {number[]} The left and top borders. */
 	_getBorders: function(elem) {
 		var convert = function(value) {
 			return {thin: 1, medium: 3, thick: 5}[value] || value;
@@ -425,11 +467,12 @@ $.extend(Keypad.prototype, {
 			parseFloat(convert(elem.css('border-top-width')))];
 	},
 
-	/* Check positioning to remain on screen.
-	   @param  inst    (object) the instance settings
-	   @param  offset  (object) the current offset
-	   @param  isFixed  (boolean) true if the text field is fixed in position
-	   @return  (object) the updated offset */
+		/** Check positioning to remain on screen.
+			@private
+			@param inst {object} The instance settings.
+			@param offset {object} The current offset.
+			@param isFixed {boolean} True if the text field is fixed in position.
+			@return {object} The updated offset. */
 	_checkOffset: function(inst, offset, isFixed) {
 		var pos = inst._input ? this._findPos(inst._input[0]) : null;
 		var browserWidth = window.innerWidth || document.documentElement.clientWidth;
@@ -463,9 +506,10 @@ $.extend(Keypad.prototype, {
 		return offset;
 	},
 	
-	/* Find an object's position on the screen.
-	   @param  obj  (element) the element to find the position for
-	   @return  (int[2]) the element's position */
+		/** Find an object's position on the screen.
+			@private
+			@param obj {Element} The element to find the position for.
+			@return {number[]} The element's position. */
 	_findPos: function(obj) {
         while (obj && (obj.type == 'hidden' || obj.nodeType != 1)) {
             obj = obj.nextSibling;
@@ -474,19 +518,20 @@ $.extend(Keypad.prototype, {
 	    return [position.left, position.top];
 	},
 
-	/* Hide the keypad from view.
-	   @param  field     (element) the text field attached to the keypad
-	   @param  duration  (string) the duration over which to close the keypad */
-	_hidePlugin: function(field, duration) {
+		/** Hide the keypad from view.
+			@param elem {Element} The text field attached to the keypad.
+			@param duration {string} The duration over which to close the keypad.
+			@example $(selector).keypad('hide') */
+		hide: function(elem, duration) {
 		var inst = this._curInst;
-		if (!inst || (field && inst != $.data(field, this.propertyName))) {
+			if (!inst || (elem && inst != $.data(elem, this.propertyName))) {
 			return;
 		}
 		if (this._keypadShowing) {
 			duration = (duration != null ? duration : inst.options.duration);
 			var showAnim = inst.options.showAnim;
 			if ($.effects && ($.effects[showAnim] || ($.effects.effect && $.effects.effect[showAnim]))) {
-				inst._mainDiv.hide(showAnim, inst.options.showOptions, duration);
+					inst._mainDiv.hide(showAnim, inst.options.showOptions || {}, duration);
 			}
 			else {
 				inst._mainDiv[(showAnim == 'slideDown' ? 'slideUp' :
@@ -507,115 +552,112 @@ $.extend(Keypad.prototype, {
 		this._curInst = null;
 	},
 
-	/* Handle keystrokes.
-	   @param  e  (event) the key event */
-	_doKeyDown: function(e) {
-		if (e.keyCode == 9) { // Tab out
+		/** Handle keystrokes.
+			@private
+			@param event {Event} The key event. */
+		_doKeyDown: function(event) {
+			if (event.keyCode == 9) { // Tab out
 			plugin.mainDiv.stop(true, true);
-			plugin._hidePlugin();
+				plugin.hide();
 		}
 	},
 
-	/* Close keypad if clicked elsewhere.
-	   @param  event  (event) the mouseclick details */
+		/** Close keypad if clicked elsewhere.
+			@private
+			@param event {Event} The mouseclick details. */
 	_checkExternalClick: function(event) {
 		if (!plugin._curInst) {
 			return;
 		}
 		var target = $(event.target);
-		if (!target.parents().andSelf().hasClass(plugin._mainDivClass) &&
-				!target.hasClass(plugin.markerClassName) &&
-				!target.parents().andSelf().hasClass(plugin._triggerClass) &&
+			if (target.closest('.' + plugin._mainDivClass).length === 0 &&
+					!target.hasClass(plugin._getMarker()) &&
+					target.closest('.' + plugin._triggerClass).length === 0 &&
 				plugin._keypadShowing) {
-			plugin._hidePlugin();
+				plugin.hide();
 		}
 	},
 
-	/* Toggle between upper and lower case.
-	   @param  inst  (object) the instance settings */
+		/** Toggle between upper and lower case.
+			@private
+			@param inst {object} The instance settings. */
 	_shiftKeypad: function(inst) {
 		inst.ucase = !inst.ucase;
 		this._updateKeypad(inst);
 		inst._input.focus(); // for further typing
 	},
 
-	/* Erase the text field.
-	   @param  inst  (object) the instance settings */
+		/** Erase the text field.
+			@private
+			@param inst {object} The instance settings. */
 	_clearValue: function(inst) {
 		this._setValue(inst, '', 0);
 		this._notifyKeypress(inst, plugin.DEL);
 	},
 
-	/* Erase the last character.
-	   @param  inst  (object) the instance settings */
+		/** Erase the last character.
+			@private
+			@param inst {object} The instance settings. */
 	_backValue: function(inst) {
-		var field = inst._input[0];
+			var elem = inst._input[0];
 		var value = inst._input.val();
 		var range = [value.length, value.length];
-		if (field.setSelectionRange) { // Mozilla
-			range = (inst._input.attr('readonly') || inst._input.attr('disabled') ?
-				range : [field.selectionStart, field.selectionEnd]);
-		}
-		else if (field.createTextRange) { // IE
-			range = (inst._input.attr('readonly') || inst._input.attr('disabled') ?
-				range : this._getIERange(field));
-		}
+			range = (inst._input.prop('readonly') || inst._input.prop('disabled') ? range :
+				(elem.setSelectionRange /* Mozilla */ ? [elem.selectionStart, elem.selectionEnd] :
+				(elem.createTextRange /* IE */ ? this._getIERange(elem) : range)));
 		this._setValue(inst, (value.length == 0 ? '' :
 			value.substr(0, range[0] - 1) + value.substr(range[1])), range[0] - 1);
 		this._notifyKeypress(inst, plugin.BS);
 	},
 
-	/* Update the text field with the selected value.
-	   @param  inst   (object) the instance settings
-	   @param  value  (string) the new character to add */
+		/** Update the text field with the selected value.
+			@private
+			@param inst {object} The instance settings.
+			@param value {string} The new character to add. */
 	_selectValue: function(inst, value) {
 		this.insertValue(inst._input[0], value);
 		this._setValue(inst, inst._input.val());
 		this._notifyKeypress(inst, value);
 	},
 
-	/* Update the text field with the selected value.
-	   @param  input  (element) the input field or
-	                  (jQuery) jQuery collection
-	   @param  value  (string) the new character to add */
+		/** Update the text field with the selected value.
+			@param input {string|Element|jQuery} The jQuery selector, input field, or jQuery collection.
+			@param value {string} The new character to add.
+			@example $.keypad.insertValue(field, 'abc'); */
 	insertValue: function(input, value) {
 		input = (input.jquery ? input : $(input));
-		var field = input[0];
+			var elem = input[0];
 		var newValue = input.val();
 		var range = [newValue.length, newValue.length];
-		if (field.setSelectionRange) { // Mozilla
-			range = (input.attr('readonly') || input.attr('disabled') ?
-				range : [field.selectionStart, field.selectionEnd]);
-		}
-		else if (field.createTextRange) { // IE
-			range = (input.attr('readonly') || input.attr('disabled') ?
-				range : this._getIERange(field));
-		}
+			range = (input.attr('readonly') || input.attr('disabled') ? range :
+				(elem.setSelectionRange /* Mozilla */ ? [elem.selectionStart, elem.selectionEnd] :
+				(elem.createTextRange /* IE */ ? this._getIERange(elem) : range)));
 		input.val(newValue.substr(0, range[0]) + value + newValue.substr(range[1]));
 		pos = range[0] + value.length;
 		if (input.is(':visible')) {
 			input.focus(); // for further typing
 		}
-		if (field.setSelectionRange) { // Mozilla
+			if (elem.setSelectionRange) { // Mozilla
 			if (input.is(':visible')) {
-				field.setSelectionRange(pos, pos);
+					elem.setSelectionRange(pos, pos);
 			}
 		}
-		else if (field.createTextRange) { // IE
-			range = field.createTextRange();
+			else if (elem.createTextRange) { // IE
+				range = elem.createTextRange();
 			range.move('character', pos);
 			range.select();
 		}
 	},
 
-	/* Get the coordinates for the selected area in the text field in IE.
-	   @param  field  (element) the target text field
-	   @return  (int[2]) the start and end positions of the selection */
-	_getIERange: function(field) {
-		field.focus();
+		/** Get the coordinates for the selected area in the text field in IE.
+			@private
+			@param elem {Element} The target text field.
+			@return {number[]} The start and end positions of the selection. */
+		_getIERange: function(elem) {
+			elem.focus();
 		var selectionRange = document.selection.createRange().duplicate();
 		// Use two ranges: before and selection
-		var beforeRange = this._getIETextRange(field);
+			var beforeRange = this._getIETextRange(elem);
 		beforeRange.setEndPoint('EndToStart', selectionRange);
 		// Check each range for trimmed newlines by shrinking the range by one
 		// character and seeing if the text property has changed. If it has not
@@ -645,22 +687,23 @@ $.extend(Keypad.prototype, {
 		return [beforeText.length, beforeText.length + selectionText.length];
 	},
 
-	/* Create an IE text range for the text field.
-	   @param  field  (element) the target text field
-	   @return  (object) the corresponding text range */
-	_getIETextRange: function(field) {
-		var isInput = (field.nodeName.toLowerCase() == 'input');
-		var range = (isInput ? field.createTextRange() : document.body.createTextRange());
+		/** Create an IE text range for the text field.
+			@private
+			@param elem {Element} The target text field.
+			@return {object} The corresponding text range. */
+		_getIETextRange: function(elem) {
+			var isInput = (elem.nodeName.toLowerCase() == 'input');
+			var range = (isInput ? elem.createTextRange() : document.body.createTextRange());
 		if (!isInput) {
-			range.moveToElementText(field); // Selects all the text for a textarea
+				range.moveToElementText(elem); // Selects all the text for a textarea
 		}
 		return range;
 	},
 
-	/* Set the text field to the selected value,
-	   and trigger any on change event.
-	   @param  inst   (object) the instance settings
-	   @param  value  (string) the new value for the text field */
+		/** Set the text field to the selected value, and trigger any on change event.
+			@private
+			@param inst {object} The instance settings.
+			@param value {string} The new value for the text field. */
 	_setValue: function(inst, value) {
 		var maxlen = inst._input.attr('maxlength');
 		if (maxlen > -1) {
@@ -672,6 +715,10 @@ $.extend(Keypad.prototype, {
 		}
 	},
 
+		/** Notify clients of a keypress.
+			@private
+			@param inst {object} The instance settings.
+			@param key {string} The character pressed. */
 	_notifyKeypress: function(inst, key) {
 		if ($.isFunction(inst.options.onKeypress)) { // trigger custom callback
 			inst.options.onKeypress.apply((inst._input ? inst._input[0] : null),
@@ -679,9 +726,10 @@ $.extend(Keypad.prototype, {
 		}
 	},
 
-	/* Generate the HTML for the current state of the keypad.
-	   @param  inst  (object) the instance settings
-	   @return  (jQuery) the HTML for this keypad */
+		/** Generate the HTML for the current state of the keypad.
+			@private
+			@param inst {object} The instance settings.
+			@return {jQuery} The HTML for this keypad. */
 	_generateHTML: function(inst) {
 		var html = (!inst.options.prompt ? '' : '<div class="' + this._promptClass +
 			(inst.options.useThemeRoller ? ' ui-widget-header ui-corner-all' : '') + '">' +
@@ -727,10 +775,10 @@ $.extend(Keypad.prototype, {
 		return html;
 	},
 
-	/* Check whether characters should be randomised,
-	   and, if so, produce the randomised layout.
-	   @param  inst  (object) the instance settings
-	   @return  (string[]) the layout with any requested randomisations applied */
+		/** Check whether characters should be randomised, and, if so, produce the randomised layout.
+			@private
+			@param inst {object} The instance settings.
+			@return {string[]} The layout with any requested randomisations applied. */
 	_randomiseLayout: function(inst) {
 		if (!inst.options.randomiseNumeric && !inst.options.randomiseAlphabetic &&
 				!inst.options.randomiseOther && !inst.options.randomiseAll) {
@@ -789,35 +837,38 @@ $.extend(Keypad.prototype, {
 		return newLayout;
 	},
 
-	/* Is a given character a control character?
-	   @param  ch  (char) the character to test
-	   @return  (boolean) true if a control character, false if not */
+		/** Is a given character a control character?
+			@private
+			@param ch {string} The character to test.
+			@return {boolean} True if a control character, false if not. */
 	_isControl: function(ch) {
 		return ch < ' ';
 	},
 
-	/* Is a given character alphabetic?
-	   @param  ch  (char) the character to test
-	   @return  (boolean) true if alphabetic, false if not */
+		/** Is a given character alphabetic?
+			@param ch {string} The character to test.
+			@return {boolean} True if alphabetic, false if not. */
 	isAlphabetic: function(ch) {
 		return (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z');
 	},
 
-	/* Is a given character numeric?
-	   @param  ch  (char) the character to test
-	   @return  (boolean) true if numeric, false if not */
+		/** Is a given character numeric?
+			@param ch {string} The character to test.
+			@return {boolean} True if numeric, false if not. */
 	isNumeric: function(ch) {
 		return (ch >= '0' && ch <= '9');
 	},
 
-	/* Convert a character to upper case.
-	   @param  ch  (char) the character to convert
-	   @return  (char) its uppercase version */
+		/** Convert a character to upper case.
+			@param ch {string} The character to convert.
+			@return {string} Its uppercase version. */
 	toUpper: function(ch) {
 		return ch.toUpperCase();
 	},
-	/* Randomise the contents of an array.
-	   @param  values  (string[]) the array to rearrange */
+		
+		/** Randomise the contents of an array.
+			@private
+			@param values {string[]} The array to rearrange. */
 	_shuffle: function(values) {
 		for (var i = values.length - 1; i > 0; i--) {
 			var j = Math.floor(Math.random() * values.length);
@@ -826,53 +877,41 @@ $.extend(Keypad.prototype, {
 			values[j] = ch;
 		}
 	}
-});
-
-// The list of commands that return values and don't permit chaining
-var getters = ['isDisabled'];
-
-/* Determine whether a command is a getter and doesn't permit chaining.
-   @param  command    (string, optional) the command to run
-   @param  otherArgs  ([], optional) any other arguments for the command
-   @return  true if the command is a getter, false if not */
-function isNotChained(command, otherArgs) {
-	if (command == 'option' && (otherArgs.length == 0 ||
-			(otherArgs.length == 1 && typeof otherArgs[0] == 'string'))) {
-		return true;
-	}
-	return $.inArray(command, getters) > -1;
-}
-
-/* Invoke the keypad functionality.
-   @param  options  (object) the new settings to use for these instances (optional) or
-                    (string) the command to run (optional)
-   @return  (jQuery) for chaining further calls or
-            (any) getter value */
-$.fn.keypad = function(options) {
-	var otherArgs = Array.prototype.slice.call(arguments, 1);
-	if (isNotChained(options, otherArgs)) {
-		return plugin['_' + options + 'Plugin'].apply(plugin, [this[0]].concat(otherArgs));
-	}
-	return this.each(function() {
-		if (typeof options == 'string') {
-			if (!plugin['_' + options + 'Plugin']) {
-				throw 'Unknown command: ' + options;
-			}
-			plugin['_' + options + 'Plugin'].apply(plugin, [this].concat(otherArgs));
-		}
-		else {
-			plugin._attachPlugin(this, options || {});
-		}
 	});
-};
 
-/* Initialise the keypad functionality. */
-var plugin = $.keypad = new Keypad(); // Singleton instance
+	var plugin = $.keypad;
 
-// Add the keypad division and external click check
-$(function() {
+	// Initialise the key definitions
+	plugin.addKeyDef('CLOSE', 'close', function(inst) {
+		plugin._curInst = (inst._inline ? inst : plugin._curInst);
+		plugin.hide();
+	});
+	plugin.addKeyDef('CLEAR', 'clear', function(inst) { plugin._clearValue(inst); });
+	plugin.addKeyDef('BACK', 'back', function(inst) { plugin._backValue(inst); });
+	plugin.addKeyDef('SHIFT', 'shift', function(inst) { plugin._shiftKeypad(inst); });
+	plugin.addKeyDef('SPACE_BAR', 'spacebar', function(inst) { plugin._selectValue(inst, ' '); }, true);
+	plugin.addKeyDef('SPACE', 'space');
+	plugin.addKeyDef('HALF_SPACE', 'half-space');
+	plugin.addKeyDef('ENTER', 'enter', function(inst) { plugin._selectValue(inst, '\x0D'); }, true);
+	plugin.addKeyDef('TAB', 'tab', function(inst) { plugin._selectValue(inst, '\x09'); }, true);
+
+	// Initialise the layouts and settings
+	plugin.numericLayout = ['123' + plugin.CLOSE, '456' + plugin.CLEAR, '789' + plugin.BACK, plugin.SPACE + '0'];
+	plugin.qwertyLayout = ['!@#$%^&*()_=' + plugin.HALF_SPACE + plugin.SPACE + plugin.CLOSE,
+		plugin.HALF_SPACE + '`~[]{}<>\\|/' + plugin.SPACE + '789',
+		'qwertyuiop\'"' + plugin.HALF_SPACE + '456',
+		plugin.HALF_SPACE + 'asdfghjkl;:' + plugin.SPACE + '123',
+		plugin.SPACE + 'zxcvbnm,.?' + plugin.SPACE + plugin.HALF_SPACE + '-0+',
+		'' + plugin.TAB + plugin.ENTER + plugin.SPACE_BAR + plugin.SHIFT +
+		plugin.HALF_SPACE + plugin.BACK + plugin.CLEAR],
+	$.extend(plugin.regionalOptions[''], {alphabeticLayout: plugin.qwertyAlphabetic, fullLayout: plugin.qwertyLayout,
+		isAlphabetic: plugin.isAlphabetic, isNumeric: plugin.isNumeric, toUpper: plugin.toUpper});
+	plugin.setDefaults($.extend({layout: plugin.numericLayout}, plugin.regionalOptions['']));
+
+	// Add the keypad division and external click check
+	$(function() {
 	$(document.body).append(plugin.mainDiv).
 		mousedown(plugin._checkExternalClick);
-});
+	});
 
 })(jQuery);