Merge branch 'release/0.4.3'

Author: the-darc

CHANGELOG.md

@@ -1,3 +1,18 @@
+<a name"0.4.3"></a>
+### 0.4.3 (2015-11-19)
+
+
+#### Bug Fixes
+
+* **VKI_insert:** trim button text before insert in the input field ([52956b40](https://github.com/the-darc/angular-virtual-keyboard/commit/52956b40))
+* **bower:** include css in main section of bower ([05e9899](https://github.com/the-darc/angular-virtual-keyboard/commit/05e9899))
+* **UAParser:** Windows Phone added to supported mobile platforms ([9143622](https://github.com/the-darc/angular-virtual-keyboard/commit/9143622))
+
+#### Features
+
+* **custom-class:** add support to custom-class configuration ([b2477cd5](https://github.com/the-darc/angular-virtual-keyboard/commit/b2477cd5))
+
+
 <a name"0.4.2"></a>
 ### 0.4.2 (2015-07-21)
 

README.md

@@ -1,19 +1,29 @@
-[![Bower version](https://badge.fury.io/bo/angular-virtual-keyboard.svg)](http://badge.fury.io/bo/angular-virtual-keyboard)
 angular-virtual-keyboard
 ========================
+[![npm version](https://badge.fury.io/js/angular-virtual-keyboard.svg)](http://badge.fury.io/js/angular-virtual-keyboard)
+[![Bower version](https://badge.fury.io/bo/angular-virtual-keyboard.svg)](http://badge.fury.io/bo/angular-virtual-keyboard)
+
 An AngularJs Virtual Keyboard Interface based on [GreyWyvern VKI](http://www.greywyvern.com/code/javascript/keyboard). See example in the [Demo page](http://the-darc.github.io/angular-virtual-keyboard).
 
 ![Demo image](http://the-darc.github.io/angular-virtual-keyboard/images/demo.png)
 
-## Bower install
+## Install
+
+### With bower
 
 ```sh
 $ bower install angular-virtual-keyboard
 ```
 
+### With npm
+
+```sh
+$ npm install angular-virtual-keyboard
+```
+
 ## Dependencies
 
-- Optional: [angular-useragent-parser](https://github.com/the-darc/angular-useragent-parser)  
+- Optional: [angular-useragent-parser](https://github.com/the-darc/angular-useragent-parser)
 _Obs.: Required to auto-hide the keyboard interface in mobile devices or to use the 'vk-force-mobile' configuration._
 
 ## Usage
@@ -36,12 +46,13 @@ _Obs.: Required to auto-hide the keyboard interface in mobile devices or to use
 
 The angular-virtual-keyboard module use an [Angular.js Constant](https://docs.angularjs.org/api/auto/service/$provide#constant) named ``VKI_CONFIG`` to handle the configurations that will be applied to all instances of the ``ng-virtual-keyboard`` directive. See list below:
 
- - __Keyboard layouts configurations__ ``VKI_CONFIG.layout`` Array of Keyboard Layout configurations. See [vki-layouts.js](https://github.com/the-darc/angular-virtual-keyboard/blob/master/src/vki-layouts.js) for keyboard layout configuration examples. 
- - __Deadkeys configurations__ ``VKI_CONFIG.deadkey`` Array of Deadkeys configurations. See [vki-deadkeys.js](https://github.com/the-darc/angular-virtual-keyboard/blob/master/src/vki-deadkeys.js) for deadkeys configuration examples. 
+ - __Keyboard layouts configurations__ ``VKI_CONFIG.layout`` Array of Keyboard Layout configurations. See [vki-layouts.js](https://github.com/the-darc/angular-virtual-keyboard/blob/master/src/vki-layouts.js) for keyboard layout configuration examples.
+ - __Deadkeys configurations__ ``VKI_CONFIG.deadkey`` Array of Deadkeys configurations. See [vki-deadkeys.js](https://github.com/the-darc/angular-virtual-keyboard/blob/master/src/vki-deadkeys.js) for deadkeys configuration examples.
  - __Default keyboard layout__ ``VKI_CONFIG.kt`` Name of the layout configuration to be used as default (if no specific layout configuration is provided in the directive instance configuration). _Default: 'US International'_
  - __Relative position__ ``VKI_CONFIG.relative`` Use ``true`` to position the keyboard next to the input, ``false`` to place in the bottom of page. _Default: ``true``_
  - __Adjust keyboard size__ ``VKI_CONFIG.sizeAdj`` Allow user to adjust keyboard size. _Default: ``true``_
- - __i18n configuration__ ``VKI_CONFIG.i18n`` An array to replace the default labels of the keyboard interface. See example below:  
+ - __i18n configuration__ ``VKI_CONFIG.i18n`` An array to replace the default labels of the keyboard interface. See example below:
+ - __Custom CSS Class__ ``VKI_CONFIG.customClass`` A CSS class name to add in the first html element of the keyboard
 ```javascript
 VKI_CONFIG.i18n = {
 	'00': "Exibir teclado numérico",
@@ -74,6 +85,7 @@ The ``ng-virtual-keyboard`` could receive an array with the configurations that
  - __Relative position__ ``relative`` Use ``true`` to position the keyboard next to the input, and ``false`` to place in the bottom of page. _Default: ``true``_
  - __Keyboard size control__ ``size`` Five sizes based on font-size have been pre-programmed: 13px, 16px (default), 20px, 24px and 28px; corresponding to the sizes 1 to 5 respectively. _Default: 3_
  - __Adjust keyboard size__ ``sizeAdj`` Allow user to adjust keyboard size. _Default: ``true``_
+ - __Custom CSS Class__ ``customClass`` A CSS class name to add in the first html element of the keyboard
 
 ### Example of use
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-virtual-keyboard",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "homepage": "https://github.com/the-darc/angular-virtual-keyboard",
   "author": "the-darc <[email protected]>",
   "description": "An AngularJs Virtual Keyboard Interface based on GreyWyvern VKI",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "angular-virtual-keyboard",
-  "version": "0.4.2",
-  "description": "",
+  "version": "0.4.3",
+  "description": "An AngularJs Virtual Keyboard Interface based on GreyWyvern VKI",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -12,6 +12,11 @@
   },
   "author": "the-darc <[email protected]>",
   "license": "MIT",
+  "keywords": [
+    "Keyboard",
+    "Virtual",
+    "VKI"
+  ],
   "bugs": {
     "url": "https://github.com/the-darc/angular-virtual-keyboard/issues"
   },

release/angular-virtual-keyboard.js

@@ -1,7 +1,7 @@
 /**
  * angular-virtual-keyboard
  * An AngularJs Virtual Keyboard Interface based on GreyWyvern VKI
- * @version v0.4.2
+ * @version v0.4.3
  * @author the-darc <[email protected]>
  * @link https://github.com/the-darc/angular-virtual-keyboard
  * @license MIT
@@ -87,6 +87,7 @@ var VKI = function(customConfig, layout, deadKeys, keyInputCallback) {
   this.VKI_keyCenter = config.keyCenter || 3;
   this.VKI_forcePosition = config.forcePosition || false;
   this.VKI_relative = config.relative === false ? false : true;
+  this.VKI_customClass = config.customClass || false;
 
   this.VKI_isIE = /*@cc_on!@*/false;
   this.VKI_isIE6 = /*@if(@_jscript_version == 5.6)!@end@*/false;
@@ -289,6 +290,9 @@ var VKI = function(customConfig, layout, deadKeys, keyInputCallback) {
   if (this.VKI_relative) {
     self.VKI_keyboard.className += ' relativeKeyboard';
   }
+  if (this.VKI_customClass) {
+    self.VKI_keyboard.className += ' ' + this.VKI_customClass;
+  }
   this.VKI_keyboard.dir = "ltr";
   this.VKI_keyboard.cellSpacing = "0";
   this.VKI_keyboard.reflow = function() {
@@ -748,6 +752,9 @@ var VKI = function(customConfig, layout, deadKeys, keyInputCallback) {
    */
   this.VKI_insert = function(text) {
     this.VKI_target.focus();
+    if (text && text.length > 1 && text.trim) {
+      text = text.trim();
+    }
     if (this.VKI_target.maxLength) this.VKI_target.maxlength = this.VKI_target.maxLength;
     if (typeof this.VKI_target.maxlength == "undefined" ||
         this.VKI_target.maxlength < 0 ||
@@ -1062,7 +1069,8 @@ angular.module('angular-virtual-keyboard', [])
 		'11': 'Increase keyboard size'
 	},
 	relative: true,
-	sizeAdj: true
+	sizeAdj: true,
+	customClass: false
 })
 .service('ngVirtualKeyboardService', ['VKI_CONFIG', function(VKI_CONFIG) {
 	/*globals VKI */
@@ -1074,6 +1082,7 @@ angular.module('angular-virtual-keyboard', [])
 			config.relative = config.relative === false ? false : VKI_CONFIG.relative;
 			config.keyCenter = config.keyCenter || VKI_CONFIG.keyCenter;
 			config.sizeAdj = config.sizeAdj === false ? false : VKI_CONFIG.sizeAdj;
+			config.customClass = config.customClass || VKI_CONFIG.customClass;
 
 			var vki = new VKI(config, VKI_CONFIG.layout, VKI_CONFIG.deadkey, inputCallback);
 			vki.attachVki(element);
@@ -1098,8 +1107,10 @@ angular.module('angular-virtual-keyboard', [])
 				var UAParser = $injector.get('UAParser');
 				var results = new UAParser().getResult();
 				var isMobile = results.device.type === 'mobile' || results.device.type === 'tablet';
-                isMobile = isMobile || (results.os && (results.os.name === 'Android'));
-                isMobile = isMobile || (results.os && (results.os.name === 'iOS'));
+		                isMobile = isMobile || (results.os && (results.os.name === 'Android'));
+		                isMobile = isMobile || (results.os && (results.os.name === 'iOS'));
+		                isMobile = isMobile || (results.os && (results.os.name === 'Windows Phone'));
+		                isMobile = isMobile || (results.os && (results.os.name === 'Windows Mobile'));
 				if (isMobile && scope.config.showInMobile !== true) {
 					return;
 				}

release/angular-virtual-keyboard.min.js

@@ -61,7 +61,8 @@ angular.module('angular-virtual-keyboard', [])
 		'11': 'Increase keyboard size'
 	},
 	relative: true,
-	sizeAdj: true
+	sizeAdj: true,
+	customClass: false
 })
 .service('ngVirtualKeyboardService', ['VKI_CONFIG', function(VKI_CONFIG) {
 	/*globals VKI */
@@ -73,6 +74,7 @@ angular.module('angular-virtual-keyboard', [])
 			config.relative = config.relative === false ? false : VKI_CONFIG.relative;
 			config.keyCenter = config.keyCenter || VKI_CONFIG.keyCenter;
 			config.sizeAdj = config.sizeAdj === false ? false : VKI_CONFIG.sizeAdj;
+			config.customClass = config.customClass || VKI_CONFIG.customClass;
 
 			var vki = new VKI(config, VKI_CONFIG.layout, VKI_CONFIG.deadkey, inputCallback);
 			vki.attachVki(element);

src/angular-virtual-keyboard.js

@@ -77,6 +77,7 @@ var VKI = function(customConfig, layout, deadKeys, keyInputCallback) {
   this.VKI_keyCenter = config.keyCenter || 3;
   this.VKI_forcePosition = config.forcePosition || false;
   this.VKI_relative = config.relative === false ? false : true;
+  this.VKI_customClass = config.customClass || false;
 
   this.VKI_isIE = /*@cc_on!@*/false;
   this.VKI_isIE6 = /*@if(@_jscript_version == 5.6)!@end@*/false;
@@ -279,6 +280,9 @@ var VKI = function(customConfig, layout, deadKeys, keyInputCallback) {
   if (this.VKI_relative) {
     self.VKI_keyboard.className += ' relativeKeyboard';
   }
+  if (this.VKI_customClass) {
+    self.VKI_keyboard.className += ' ' + this.VKI_customClass;
+  }
   this.VKI_keyboard.dir = "ltr";
   this.VKI_keyboard.cellSpacing = "0";
   this.VKI_keyboard.reflow = function() {
@@ -738,6 +742,9 @@ var VKI = function(customConfig, layout, deadKeys, keyInputCallback) {
    */
   this.VKI_insert = function(text) {
     this.VKI_target.focus();
+    if (text && text.length > 1 && text.trim) {
+      text = text.trim();
+    }
     if (this.VKI_target.maxLength) this.VKI_target.maxlength = this.VKI_target.maxLength;
     if (typeof this.VKI_target.maxlength == "undefined" ||
         this.VKI_target.maxlength < 0 ||