From 6c5b514b9b234adb9f199487cf17a13471873078 Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Fri, 6 Jun 2014 16:53:09 +1000 Subject: [PATCH 1/4] Rescoping the accordion as well --- .../controllers/checkout/accordion_controller.js.coffee | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/darkswarm/controllers/checkout/accordion_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/checkout/accordion_controller.js.coffee index a0ba6f4e29..accfcaec9a 100644 --- a/app/assets/javascripts/darkswarm/controllers/checkout/accordion_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/checkout/accordion_controller.js.coffee @@ -1,16 +1,11 @@ -Darkswarm.controller "AccordionCtrl", ($scope, storage, $timeout) -> +Darkswarm.controller "AccordionCtrl", ($scope, storage, $timeout, CurrentHub) -> $scope.accordion = details: true shipping: false payment: false billing: false - storage.bind $scope, "accordion", {storeName: "accordion_#{$scope.order.id}"} + storage.bind $scope, "accordion", {storeName: "accordion_#{$scope.order.id}#{CurrentHub.id}#{$scope.order.user_id}"} $scope.show = (name)-> $scope.accordion[name] = true - #$timeout => - #if $scope.checkout.$valid - #for k, v of $scope.accordion - #$scope.accordion[k] = false - From 7953ff145c39812f098df0854bde1a03f687a2ff Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Fri, 6 Jun 2014 17:23:28 +1000 Subject: [PATCH 2/4] Fixing a merge issue --- app/views/map/index.html.haml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/views/map/index.html.haml b/app/views/map/index.html.haml index a128c61872..9fec2290d8 100644 --- a/app/views/map/index.html.haml +++ b/app/views/map/index.html.haml @@ -1,9 +1,3 @@ -<<<<<<< HEAD -- content_for :scripts do - %script{src: "//maps.googleapis.com/maps/api/js?sensor=false"} - -======= ->>>>>>> master = inject_json "enterprisesForMap" , "enterprises_for_map", collection: @enterprises .ofn-map-container{"fill-vertical" => true} From c8520cedbb86ce25a51f1cccd46c1801c94eaa8c Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Fri, 6 Jun 2014 17:26:06 +1000 Subject: [PATCH 3/4] Fixing another merge issue --- .../javascripts/darkswarm/services/map.js.coffee | 10 ---------- app/assets/javascripts/templates/map_modal.html.haml | 4 ---- 2 files changed, 14 deletions(-) diff --git a/app/assets/javascripts/darkswarm/services/map.js.coffee b/app/assets/javascripts/darkswarm/services/map.js.coffee index 3405db592d..eb1a195490 100644 --- a/app/assets/javascripts/darkswarm/services/map.js.coffee +++ b/app/assets/javascripts/darkswarm/services/map.js.coffee @@ -6,17 +6,7 @@ Darkswarm.factory "OfnMap", (enterprisesForMap, MapModal)-> # Adding methods to each enterprise extend: (enterprise)-> new class MapMarker -<<<<<<< HEAD - icon: "/test.opng" - constructor: -> - @[k] = v for k, v of enterprise - - reveal: => - - console.log @ -======= constructor: -> @[k] = v for k, v of enterprise reveal: => ->>>>>>> master MapModal.open @ diff --git a/app/assets/javascripts/templates/map_modal.html.haml b/app/assets/javascripts/templates/map_modal.html.haml index cfe0f3bfbe..54c834253a 100644 --- a/app/assets/javascripts/templates/map_modal.html.haml +++ b/app/assets/javascripts/templates/map_modal.html.haml @@ -2,12 +2,8 @@ .small-12.columns.producer-hero %h3.producer-name %i.ofn-i_036-producers -<<<<<<< HEAD - {{ producer.name }} -======= {{ enterprise.name }} {{ enterprise.id }} ->>>>>>> master %img.producer-hero-img{"ng-src" => "{{enterprise.promo_image}}"} .row From 21b6e91913548dfaa3db60d7a4e8aa9edba1f6e7 Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Tue, 10 Jun 2014 12:29:31 +1000 Subject: [PATCH 4/4] Moving OFN flash to fixed block --- app/assets/javascripts/darkswarm/directives/flash.js.coffee | 2 +- app/views/layouts/darkswarm.html.haml | 2 -- app/views/map/index.html.haml | 2 -- app/views/shared/menu/_menu.html.haml | 1 + 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/darkswarm/directives/flash.js.coffee b/app/assets/javascripts/darkswarm/directives/flash.js.coffee index a302a2a891..b5c9aaddd8 100644 --- a/app/assets/javascripts/darkswarm/directives/flash.js.coffee +++ b/app/assets/javascripts/darkswarm/directives/flash.js.coffee @@ -16,7 +16,7 @@ Darkswarm.directive "ofnFlash", (flash, $timeout, RailsFlashLoader)-> show = (message, type)=> if message $scope.flashes.push({message: message, type: typePairings[type]}) - $timeout($scope.delete, 5000) + $timeout($scope.delete, 10000) $scope.delete = -> $scope.flashes.shift() diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml index 1b1d97f85d..48fec6aa9d 100644 --- a/app/views/layouts/darkswarm.html.haml +++ b/app/views/layouts/darkswarm.html.haml @@ -27,8 +27,6 @@ .inner-wrap = render partial: "shared/menu/menu" - %ofn-flash - %section{ role: "main" } = yield diff --git a/app/views/map/index.html.haml b/app/views/map/index.html.haml index 9fec2290d8..45c6a8778c 100644 --- a/app/views/map/index.html.haml +++ b/app/views/map/index.html.haml @@ -5,5 +5,3 @@ %google-map{center: "map.center", zoom: "map.zoom", styles: "map.styles", draggable: "true"} %markers{models: "OfnMap.enterprises", fit: "true", coords: "'self'", icon: "'icon'", click: "'reveal'"} - - diff --git a/app/views/shared/menu/_menu.html.haml b/app/views/shared/menu/_menu.html.haml index d673a962db..616b128d78 100644 --- a/app/views/shared/menu/_menu.html.haml +++ b/app/views/shared/menu/_menu.html.haml @@ -1,3 +1,4 @@ .fixed = render partial: "shared/menu/large_menu" + %ofn-flash = render partial: "shared/menu/mobile_menu"