From b34eca1e8137716e36aacb4e5d96b07e5b878ee2 Mon Sep 17 00:00:00 2001
From: Koen Bok <koen@madebysofa.com>
Date: Fri, 17 Jul 2015 23:41:32 +0200
Subject: [PATCH] Fix for image cache

Cache is now disabled only for local images (server and file urls). You can optionally force using the cache by using layer. _alwaysUseImageCache.
---
 framer/Components/DeviceComponent.coffee |  2 +-
 framer/Layer.coffee                      | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/framer/Components/DeviceComponent.coffee b/framer/Components/DeviceComponent.coffee
index d31332af3..c33b4e561 100644
--- a/framer/Components/DeviceComponent.coffee
+++ b/framer/Components/DeviceComponent.coffee
@@ -261,7 +261,7 @@ class exports.DeviceComponent extends BaseClass
 		else if not @_deviceImageUrl(@_deviceImageName())
 			@phone.image  = ""
 		else
-			@phone._cacheImage = true
+			@phone._alwaysUseImageCache = true
 			@phone.image  = @_deviceImageUrl(@_deviceImageName())
 			@phone.width  = @_device.deviceImageWidth
 			@phone.height = @_device.deviceImageHeight
diff --git a/framer/Layer.coffee b/framer/Layer.coffee
index 22abc4097..b0dc5ad27 100644
--- a/framer/Layer.coffee
+++ b/framer/Layer.coffee
@@ -53,7 +53,7 @@ class exports.Layer extends BaseClass
 		# Special power setting for 2d rendering path. Only enable this
 		# if you know what you are doing. See LayerStyle for more info.
 		@_prefer2d = false
-		@_cacheImage = true
+		@_alwaysUseImageCache = false
 
 		# We have to create the element before we set the defaults
 		@_createElement()
@@ -547,18 +547,12 @@ class exports.Layer extends BaseClass
 			# imageUrl = Config.baseUrl + imageUrl
 
 
-			# See if we need to cache the image
-			shoudUseImageCache = true
+			print imageUrl
+			print "@_cacheImage", @_cacheImage
+			print "Utils.isLocalAssetUrl(imageUrl)", Utils.isLocalAssetUrl(imageUrl)
 
-			# We can always disable the cache with this property
-			if @_cacheImage is false
-				shoudUseImageCache = false
 
-			# If this is a file url, we don't use any cache
-			else if Utils.isLocalAssetUrl(imageUrl)
-				shoudUseImageCache = false
-
-			if shoudUseImageCache is false
+			if @_alwaysUseImageCache is false and Utils.isLocalAssetUrl(imageUrl)
 				imageUrl += "?nocache=#{NoCacheDateKey}"
 
 			# As an optimization, we will only use a loader
@@ -769,6 +763,8 @@ class exports.Layer extends BaseClass
 		exportable: false
 		get: ->
 			@_draggable ?= new LayerDraggable(@)
+		set: (value) ->
+			@draggable.enabled = value if _.isBoolean(value)
 
 	# anchor: ->
 	# 	if not @_anchor