From 41d78fd4c5dbc4299a7179e8f82e460c9bd880f1 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Wed, 3 Dec 2014 19:43:57 -0800 Subject: [PATCH 1/2] Payments view now sorts payments by date. --- app/views/account/PaymentsView.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/account/PaymentsView.coffee b/app/views/account/PaymentsView.coffee index 78e01b0e4..4bf7b7a62 100644 --- a/app/views/account/PaymentsView.coffee +++ b/app/views/account/PaymentsView.coffee @@ -17,7 +17,7 @@ module.exports = class PaymentsView extends RootView constructor: (options) -> super(options) - @payments = new CocoCollection([], { url: '/db/payment', model: Payment }) + @payments = new CocoCollection([], { url: '/db/payment', model: Payment, comparator:'_id' }) @supermodel.loadCollection(@payments, 'payments') getRenderData: -> From 69623edefbc12443698acfa58da7e4c85836f76e Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Wed, 3 Dec 2014 20:46:47 -0800 Subject: [PATCH 2/2] WorldMapView no longer restricting access to adventurer and started levels. --- app/views/play/WorldMapView.coffee | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/views/play/WorldMapView.coffee b/app/views/play/WorldMapView.coffee index b86bb8222..a9b3305ef 100644 --- a/app/views/play/WorldMapView.coffee +++ b/app/views/play/WorldMapView.coffee @@ -205,7 +205,7 @@ module.exports = class WorldMapView extends RootView @adjustLevelInfoPosition e @endHighlight() else - if @requiresSubscription + if @requiresSubscription and not @levelStatusMap[level.id] and not level.adventurer modal = if me.get('anonymous') then AuthModal else SubscribeModal @openModalView new modal() else if $(e.target).attr('disabled') @@ -775,6 +775,7 @@ forest = [ continue: 'touch-of-death' x: 47 y: 71 + adventurer: true } { name: 'Touch of Death' @@ -786,6 +787,7 @@ forest = [ continue: 'bonemender' x: 52 y: 70 + adventurer: true } { name: 'Bonemender' @@ -797,6 +799,7 @@ forest = [ continue: 'coinucopia' x: 58 y: 67 + adventurer: true } { @@ -853,6 +856,7 @@ forest = [ continue: 'multiplayer-treasure-grove' x: 80 y: 88 + adventurer: true } { name: 'Siege of Stonehold' @@ -865,6 +869,7 @@ forest = [ disabled: not me.isAdmin() x: 85.5 y: 83.5 + adventurer: true } { name: 'Multiplayer Treasure Grove' @@ -874,6 +879,7 @@ forest = [ description: 'Mix collection, flags, and combat in this multiplayer coin-gathering arena.' x: 56.5 y: 20 + adventurer: true } { name: 'Dueling Grounds' @@ -883,6 +889,7 @@ forest = [ description: 'Battle head-to-head against another hero in this basic beginner combat arena.' x: 83 y: 23 + adventurer: true } ]