Fix device detection

koenbok · Mar 10, 2015 · e6cd862 · e6cd862
1 parent 3b25bba
commit e6cd862
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/framer/DeviceView.coffee b/framer/DeviceView.coffee
@@ -155,7 +155,13 @@ class exports.DeviceView extends BaseClass
 		if @deviceType is "fullscreen"
 			return true
 
-		if Utils.deviceType() is @_device.deviceType
+		if Utils.deviceType() is "phone" and Utils.deviceType() is @_device.deviceType
+			return true
+
+		if Utils.deviceType() is "tablet" and Utils.deviceType() is @_device.deviceType
+			return true
+
+		if Utils.deviceType() is "phone" and @_device.deviceType is "tablet"
 			return true
 
 		return false

diff --git a/framer/Utils.coffee b/framer/Utils.coffee
@@ -262,12 +262,12 @@ Utils.deviceType = ->
 	# Taken from
 	# https://github.com/jeffmcmahan/device-detective/blob/master/bin/device-detect.js
 
+	if /(tablet)|(iPad)|(Nexus 9)/i.test(navigator.userAgent)
+		return "tablet"
+
 	if /(mobi)/i.test(navigator.userAgent)
 		return "phone"
 
-	if /(tablet)|(iPad)/i.test(navigator.userAgent)
-		return "tablet"
-
 	return "desktop"
 
 Utils.pathJoin = ->