raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix use of Mixin

Browse Source 
Don't bind junk to the window object 👍
This commit is contained in:
Matt-Yorkley
2021-08-02 12:43:53 +01:00
parent e1155277fc
commit 54df1b3e51
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/darkswarm/controllers/checkout/billing_controller.js.coffee
View File

@@ -1,5 +1,6 @@
angular.module('Darkswarm').controller "BillingCtrl", ($scope, $timeout) ->
angular.extend(this, new FieldsetMixin($scope))
angular.module('Darkswarm').controller "BillingCtrl", ($scope, $timeout, $controller) ->
angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
$scope.name = "billing"
$scope.nextPanel = "shipping"

5
app/assets/javascripts/darkswarm/controllers/checkout/details_controller.js.coffee
View File

@@ -1,5 +1,6 @@
angular.module('Darkswarm').controller "DetailsCtrl", ($scope, $timeout, $http, CurrentUser, AuthenticationService, SpreeUser) ->
angular.extend(this, new FieldsetMixin($scope))
angular.module('Darkswarm').controller "DetailsCtrl", ($scope, $timeout, $http, CurrentUser, AuthenticationService, SpreeUser, $controller) ->
angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
$scope.name = "details"
$scope.nextPanel = "billing"

4
app/assets/javascripts/darkswarm/controllers/checkout/payment_controller.js.coffee
View File

@@ -1,5 +1,5 @@
angular.module('Darkswarm').controller "PaymentCtrl", ($scope, $timeout, savedCreditCards, Dates) ->
angular.extend(this, new FieldsetMixin($scope))
angular.module('Darkswarm').controller "PaymentCtrl", ($scope, $timeout, savedCreditCards, Dates, $controller) ->
angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
$scope.savedCreditCards = savedCreditCards
$scope.name = "payment"

5
app/assets/javascripts/darkswarm/controllers/checkout/shipping_controller.js.coffee
View File

@@ -1,5 +1,6 @@
angular.module('Darkswarm').controller "ShippingCtrl", ($scope, $timeout, ShippingMethods) ->
angular.extend(this, new FieldsetMixin($scope))
angular.module('Darkswarm').controller "ShippingCtrl", ($scope, $timeout, ShippingMethods, $controller) ->
angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
$scope.ShippingMethods = ShippingMethods
$scope.name = "shipping"
$scope.nextPanel = "payment"

5
app/assets/javascripts/darkswarm/controllers/credit_cards_controller.js.coffee
View File

@@ -1,5 +1,6 @@
angular.module('Darkswarm').controller "CreditCardsCtrl", ($scope, CreditCard, CreditCards) ->
angular.extend(this, new FieldsetMixin($scope))
angular.module('Darkswarm').controller "CreditCardsCtrl", ($scope, CreditCard, CreditCards, $controller) ->
angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
$scope.savedCreditCards = CreditCards.saved
$scope.confirmSetDefault = CreditCards.confirmSetDefault
$scope.CreditCard = CreditCard

2
app/assets/javascripts/darkswarm/mixins/fieldset_mixin.js.coffee
View File

@@ -1,4 +1,4 @@
window.FieldsetMixin = ($scope)->
angular.module('Darkswarm').controller "FieldsetMixin", ($scope, $timeout) ->
$scope.next = (event = false)->
event.preventDefault() if event
return unless $scope.nextPanel