fix ipad air device

koenbok · Feb 10, 2015 · c659f32157a4546da5ba6287c2bb2eab1ee7eeed · c659f32
1 parent 5f36189
commit c659f32157a4546da5ba6287c2bb2eab1ee7eeed
Unified Split

Showing with 7 additions and 14 deletions.

+3 −10 extras/CactusFramer/static/app.coffee

+4 −4 framer/DeviceView.coffee
diff --git a/extras/CactusFramer/static/app.coffee b/extras/CactusFramer/static/app.coffee
@@ -1,11 +1,4 @@
+Framer.Device = new Framer.DeviceView()
+Framer.Device.setupContext()

-style = 
-	font: "20px/1em Menlo"
-
-layer = new Layer
-layer.backgroundColor = "rgba(255,0,0,.4)"
-layer.style = style
-layer.html = "Hello Koen Bok"
-
-layer.frame = Utils.textSize(layer.html, style, {width:100})
-print layer.frame
+Framer.Device.deviceType = "ipad-air-spacegray"
diff --git a/framer/DeviceView.coffee b/framer/DeviceView.coffee
@@ -738,14 +738,14 @@ Devices =
 		deviceImage: "ipad-mini-silver-hand.png"

 	# iPad Air
-	"ipad-air-spacegray": _.extend {}, iPadMiniBaseDevice,
+	"ipad-air-spacegray": _.extend {}, iPadAirBaseDevice,
 		deviceImage: "ipad-air-spacegray.png"
-	"ipad-air-spacegray-hand": _.extend {}, iPadMiniBaseDeviceHand,
+	"ipad-air-spacegray-hand": _.extend {}, iPadAirBaseDeviceHand,
 		deviceImage: "ipad-air-spacegray-hand.png"

-	"ipad-air-silver": _.extend {}, iPadMiniBaseDevice,
+	"ipad-air-silver": _.extend {}, iPadAirBaseDevice,
 		deviceImage: "ipad-mini-silver.png"
-	"ipad-air-silver-hand": _.extend {}, iPadMiniBaseDeviceHand,
+	"ipad-air-silver-hand": _.extend {}, iPadAirBaseDeviceHand,
 		deviceImage: "ipad-mini-silver-hand.png"

 	# Nexus 5