Fix device ssl resources

koenbok · Dec 13, 2014 · 0d766099d5906df84a6b9521b3f16201770e1f58 · 0d76609
1 parent 8e59102
commit 0d766099d5906df84a6b9521b3f16201770e1f58
Unified Split

Showing with 3 additions and 15 deletions.

+2 −14 extras/CactusFramer/static/app.coffee

+1 −1 framer/DeviceView.coffee
diff --git a/extras/CactusFramer/static/app.coffee b/extras/CactusFramer/static/app.coffee
@@ -1,14 +1,2 @@
-layer = new Layer
-layer.states.add
-	stateA: {backgroundColor:"red", x:500}
-
-# layer.scroll.should.equal false
-# layer.x.should.equal 0
-
-layer.states.on Events.StateDidSwitch, ->
-	print "done", layer.backgroundColor
-
-
-
-layer.states.switch "stateA", {curve:"ease-in-out", time:1}
-
+Framer.Device = new Framer.DeviceView()
+Framer.Device.setupContext()
diff --git a/framer/DeviceView.coffee b/framer/DeviceView.coffee
@@ -166,7 +166,7 @@ class exports.DeviceView extends BaseClass
 		if Utils.isFramerStudio() && window.FramerStudioInfo
 			resourceUrl = window.FramerStudioInfo.deviceImagesUrl
 		else
-			resourceUrl = "http://resources.framerjs.com/static/DeviceResources"
+			resourceUrl = "//resources.framerjs.com/static/DeviceResources"

 		# return "#{resourceUrl}/#{name}"