From 415a4eff0a36876586d7ffefadefb51da6f023c4 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 13 Jun 2014 11:05:32 +1000
Subject: [PATCH] Not pre-loading images and setting the map back to gifses

---
 .../javascripts/darkswarm/directives/modal.js.coffee     | 9 ++++-----
 .../darkswarm/services/map_configuration.js.coffee       | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/directives/modal.js.coffee b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
index c8ed5df4af..d727fa64c9 100644
--- a/app/assets/javascripts/darkswarm/directives/modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
@@ -8,10 +8,9 @@ Darkswarm.directive "ofnModal", ($modal)->
   link: (scope, elem, attrs, ctrl, transclude)->
     scope.title = attrs.title
     contents = null
-    # We're using an isolate scope, which is a child of the original scope
-    # We have to compile the transclude against the original scope, not the isolate
-    transclude scope.$parent, (clone)->
-      contents = clone
-
     elem.on "click", =>
+      # We're using an isolate scope, which is a child of the original scope
+      # We have to compile the transclude against the original scope, not the isolate
+      transclude scope.$parent, (clone)->
+        contents = clone
       scope.modalInstance = $modal.open(controller: ctrl, template: contents, scope: scope.$parent)
diff --git a/app/assets/javascripts/darkswarm/services/map_configuration.js.coffee b/app/assets/javascripts/darkswarm/services/map_configuration.js.coffee
index 7eeecb4a44..8f1d735357 100644
--- a/app/assets/javascripts/darkswarm/services/map_configuration.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/map_configuration.js.coffee
@@ -5,7 +5,7 @@ Darkswarm.factory "MapConfiguration", ->
         latitude: -37.4713077
         longitude: 144.7851531
       zoom: 12
-      additional_options: 
-        mapTypeId: 'satellite' 
+      additional_options: {}
+        #mapTypeId: 'satellite' 
       styles: [{"featureType":"landscape","stylers":[{"saturation":-100},{"lightness":65},{"visibility":"on"}]},{"featureType":"poi","stylers":[{"saturation":-100},{"lightness":51},{"visibility":"simplified"}]},{"featureType":"road.highway","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"road.arterial","stylers":[{"saturation":-100},{"lightness":30},{"visibility":"on"}]},{"featureType":"road.local","stylers":[{"saturation":-100},{"lightness":40},{"visibility":"on"}]},{"featureType":"transit","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"administrative.province","stylers":[{"visibility":"off"}]},{"featureType":"water","elementType":"labels","stylers":[{"visibility":"on"},{"lightness":-25},{"saturation":-100}]},{"featureType":"water","elementType":"geometry","stylers":[{"hue":"#ffff00"},{"lightness":-25},{"saturation":-97}]}]