From 944fa5f9b94aa664ba50c51840e6d16375914189 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 25 Oct 2018 13:10:39 +0200 Subject: [PATCH] fixed erb syntax for decaffeinate --- .../controllers/application.coffee | 8 ++++---- .../javascripts/controllers/events.coffee | 2 +- decaffeinate-errors.log | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 decaffeinate-errors.log diff --git a/app/assets/javascripts/controllers/application.coffee b/app/assets/javascripts/controllers/application.coffee index f08676e60..1b4449585 100644 --- a/app/assets/javascripts/controllers/application.coffee +++ b/app/assets/javascripts/controllers/application.coffee @@ -302,10 +302,10 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco # Open the modal window allowing the user to log in. ## openLoginModal = (toState, toParams, callback) -> - <% active_provider = AuthProvider.active %> - <% if active_provider.providable_type != DatabaseProvider.name %> + # <% active_provider = AuthProvider.active %> + # <% if active_provider.providable_type != DatabaseProvider.name %> $window.location.href = '<%=user_omniauth_authorize_path(AuthProvider.active.strategy_name.to_sym)%>' - <% else %> + # <% else %> $uibModal.open templateUrl: '<%= asset_path "shared/deviseModal.html" %>' size: 'sm' @@ -371,7 +371,7 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco growl.info(_t('you_will_receive_in_a_moment_an_email_with_instructions_to_reset_your_password')) # otherwise the user just closed the modal - <% end %> + # <% end %> diff --git a/app/assets/javascripts/controllers/events.coffee b/app/assets/javascripts/controllers/events.coffee index 9f9b86b14..47bcedb37 100644 --- a/app/assets/javascripts/controllers/events.coffee +++ b/app/assets/javascripts/controllers/events.coffee @@ -31,7 +31,7 @@ Application.Controllers.controller "EventsController", ["$scope", "$state", 'Eve theme_id: null age_range_id: null - $scope.monthNames = [<%= t('date.month_names')[1..-1].map { |m| "\"#{m}\"" }.join(', ') %>] + # $scope.monthNames = [<%= t('date.month_names')[1..-1].map { |m| "\"#{m}\"" }.join(', ') %>] ## # Adds a resultset of events to the bottom of the page, grouped by month diff --git a/decaffeinate-errors.log b/decaffeinate-errors.log new file mode 100644 index 000000000..e0d446dd8 --- /dev/null +++ b/decaffeinate-errors.log @@ -0,0 +1,19 @@ +===== /home/sylvain/workspace/fab-manager/app/assets/javascripts/controllers/application.coffee +NormalizeStage failed to parse: unexpected < + 303 | ## + 304 | openLoginModal = (toState, toParams, callback) -> +> 305 | <% active_provider = AuthProvider.active %> + | ^ + 306 | <% if active_provider.providable_type != DatabaseProvider.name %> + 307 | $window.location.href = '<%=user_omniauth_authorize_path(AuthProvider.active.strategy_name.to_sym)%>' + + +===== /home/sylvain/workspace/fab-manager/app/assets/javascripts/controllers/events.coffee +NormalizeStage failed to parse: unexpected < + 32 | age_range_id: null + 33 | +> 34 | $scope.monthNames = [<%= t('date.month_names')[1..-1].map { |m| "\"#{m}\"" }.join(', ') %>] + | ^ + 35 | + 36 | ## +