From c4b8a5b71ba3716ab5fab0d1cb4bf2a8fcafc7bb Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Tue, 23 Jan 2018 19:33:33 +0200
Subject: [PATCH] Do not use turbolinks gem in registrar area

---
 app/assets/javascripts/datepicker.js                | 5 -----
 app/assets/javascripts/registrar-manifest.coffee    | 1 -
 app/assets/javascripts/registrar/application.coffee | 2 +-
 app/assets/javascripts/shared/general.coffee        | 3 +--
 app/views/layouts/registrar/base.haml               | 4 ++--
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/datepicker.js b/app/assets/javascripts/datepicker.js
index 188dac211..2210612eb 100644
--- a/app/assets/javascripts/datepicker.js
+++ b/app/assets/javascripts/datepicker.js
@@ -12,10 +12,5 @@
         dateFields.datepicker();
     }
 
-    // For turbolinks
-    document.addEventListener('page:change', function() {
-        attachDatePicker();
-    });
-
     attachDatePicker();
 })();
diff --git a/app/assets/javascripts/registrar-manifest.coffee b/app/assets/javascripts/registrar-manifest.coffee
index c5d8918b6..656b5cb18 100644
--- a/app/assets/javascripts/registrar-manifest.coffee
+++ b/app/assets/javascripts/registrar-manifest.coffee
@@ -1,6 +1,5 @@
 #= require jquery
 #= require jquery_ujs
-#= require turbolinks
 #= require bootstrap-sprockets
 #= require typeahead.bundle.min
 #= require jquery.nested_attributes
diff --git a/app/assets/javascripts/registrar/application.coffee b/app/assets/javascripts/registrar/application.coffee
index f1b92f0f1..51ab8e60a 100644
--- a/app/assets/javascripts/registrar/application.coffee
+++ b/app/assets/javascripts/registrar/application.coffee
@@ -1,4 +1,4 @@
-$(document).on 'page:change', ->
+$ ->
   $('.js-contact-form').on 'restoreDefault', (e) ->
     form = $(e.target)
     form.find('.js-ident-tip').hide()
diff --git a/app/assets/javascripts/shared/general.coffee b/app/assets/javascripts/shared/general.coffee
index 05d5ce8ed..64488b5cd 100644
--- a/app/assets/javascripts/shared/general.coffee
+++ b/app/assets/javascripts/shared/general.coffee
@@ -1,5 +1,4 @@
 #= require nprogress
-#= require nprogress-turbolinks
 
 NProgress.configure
   showSpinner: false
@@ -16,7 +15,7 @@ NProgress.configure
   $('#flash').find('div').html(msg)
   $('#flash').show()
 
-$(document).on 'page:change', ->
+$ ->
   today = new Date()
   tomorrow = new Date(today)
   tomorrow.setDate(today.getDate() + 1)
diff --git a/app/views/layouts/registrar/base.haml b/app/views/layouts/registrar/base.haml
index e0bdd5f24..c3e30d90f 100644
--- a/app/views/layouts/registrar/base.haml
+++ b/app/views/layouts/registrar/base.haml
@@ -9,8 +9,8 @@
     - else
       %title= t(:registrar_head_title)
     = csrf_meta_tags
-    = stylesheet_link_tag 'registrar-manifest', media: 'all', 'data-turbolinks-track' => true
-    = javascript_include_tag 'registrar-manifest', 'data-turbolinks-track' => true
+    = stylesheet_link_tag 'registrar-manifest', media: 'all'
+    = javascript_include_tag 'registrar-manifest'
     = favicon_link_tag 'favicon.ico'
   %body
     %nav.navbar.navbar-default.navbar-fixed-top