Merge branch 'master' into develop

the-darc · Nov 19, 2015 · ff69a73 · ff69a73
2 parents f95ef16 + 1abcf24
commit ff69a73
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -4,7 +4,10 @@
   "homepage": "https://github.com/the-darc/angular-virtual-keyboard",
   "author": "the-darc <darc.tec@gmail.com>",
   "description": "An AngularJs Virtual Keyboard Interface based on GreyWyvern VKI",
-  "main": "release/angular-virtual-keyboard.min.js",
+  "main": [
+    "release/angular-virtual-keyboard.min.js",
+    "release/angular-virtual-keyboard.css"
+  ],
   "keywords": [
     "Keyboard",
     "Virtual",

diff --git a/src/angular-virtual-keyboard.js b/src/angular-virtual-keyboard.js
@@ -97,8 +97,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;
 				}