Permalink
Browse files

Merge branch 'iphone-7'

  • Loading branch information...
eelco committed Sep 26, 2016
2 parents 20ae075 + 91aaf30 commit 1955a997396e27837b00d5006883d4b018be4707
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -329,7 +329,7 @@ class exports.DeviceComponent extends BaseClass
# If we are running a local copy of Framer from the drive, get the resource online
if Utils.isFileUrl(window.location.href)
resourceUrl = "http://#{resourceUrl}"
resourceUrl = "http:#{resourceUrl}"
# If we're running Framer Studio and have local files, we'd like to use those.
# For now we always use jp2 inside framer stusio
@@ -644,6 +644,38 @@ iPadProBaseDevice =
deviceType: "tablet"
minStudioVersion: newDeviceMinVersion
iPhone7BaseDevice =
deviceImageWidth: 890
deviceImageHeight: 1814
deviceImageCompression: true
screenWidth: 750
screenHeight: 1334
deviceType: "phone"
minStudioVersion: 71
hands:
"iphone-hands-2":
width: 2400
height: 3740
"iphone-hands-1":
width: 2400
height: 3740
iPhone7PlusBaseDevice =
deviceImageWidth: 1452
deviceImageHeight: 2968
deviceImageCompression: true
screenWidth: 1242
screenHeight: 2208
deviceType: "phone"
minStudioVersion: 71
hands:
"iphone-hands-2":
width: 3987
height: 6212
"iphone-hands-1":
width: 3987
height: 6212
iPhone6BaseDevice =
deviceImageWidth: 874
deviceImageHeight: 1792
@@ -1094,13 +1126,27 @@ Devices =
"apple-ipad-pro-gold": _.clone(iPadProBaseDevice)
"apple-ipad-pro-space-gray": _.clone(iPadProBaseDevice)
# iPhone 6
# iPhone 7
"apple-iphone-7-gold": _.clone(iPhone7BaseDevice)
"apple-iphone-7-rose-gold": _.clone(iPhone7BaseDevice)
"apple-iphone-7-silver" : _.clone(iPhone7BaseDevice)
"apple-iphone-7-black": _.clone(iPhone7BaseDevice)
"apple-iphone-7-jet-black": _.clone(iPhone7BaseDevice)
# iPhone 7 Plus
#"apple-iphone-7-plus-gold": _.clone(iPhone7PlusBaseDevice)
#"apple-iphone-7-plus-rose-gold": _.clone(iPhone7PlusBaseDevice)
#"apple-iphone-7-plus-silver": _.clone(iPhone7PlusBaseDevice)
#"apple-iphone-7-plus-black": _.clone(iPhone7PlusBaseDevice)
#"apple-iphone-7-plus-jet-black": _.clone(iPhone7PlusBaseDevice)
# iPhone 6s
"apple-iphone-6s-gold": _.clone(iPhone6BaseDevice)
"apple-iphone-6s-rose-gold": _.clone(iPhone6BaseDevice)
"apple-iphone-6s-silver" : _.clone(iPhone6BaseDevice)
"apple-iphone-6s-space-gray": _.clone(iPhone6BaseDevice)
# iPhone 6+
# iPhone 6s Plus
"apple-iphone-6s-plus-gold": _.clone(iPhone6PlusBaseDevice)
"apple-iphone-6s-plus-rose-gold": _.clone(iPhone6PlusBaseDevice)
"apple-iphone-6s-plus-silver": _.clone(iPhone6PlusBaseDevice)
View
@@ -32,7 +32,7 @@ Originals =
DeviceComponent:
fullScreen: false
padding: 50
deviceType: "apple-iphone-6s-silver"
deviceType: "apple-iphone-7-silver"
deviceZoom: "fit"
contentZoom: 1
orientation: "portrait"
@@ -1,9 +1,9 @@
describe "DeviceComponent", ->
it "should default to iphone 5s spacegray", ->
it "should default to iphone 7 silver", ->
comp = new DeviceComponent()
comp.deviceType.should.equal "apple-iphone-6s-silver"
comp.deviceType.should.equal "apple-iphone-7-silver"
it "should use images on server for built in devices when not in Studio", ->

0 comments on commit 1955a99

Please sign in to comment.