From 0ec7c019b3eb9e858441ff5f7960fafa50698c1c Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Thu, 6 Oct 2016 16:05:20 +0200
Subject: [PATCH] Fix issue with pop-up windows and turbolinks [SCI-463]

---
 app/assets/javascripts/reports/new.js.erb | 43 ++++++++---------------
 app/views/reports/index.html.erb          |  2 +-
 2 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/app/assets/javascripts/reports/new.js.erb b/app/assets/javascripts/reports/new.js.erb
index 1680662b0..48ebd470f 100644
--- a/app/assets/javascripts/reports/new.js.erb
+++ b/app/assets/javascripts/reports/new.js.erb
@@ -443,37 +443,22 @@ function initializeUnsavedWorkDialog() {
     return;
   }
 
-  $(document).on('page:before-change', beforechange);
-  $(window).on('beforeunload', beforeunload);
+  $(window).on("beforeunload", function() {
+    $(window).off('beforeunload');
+    $(document).off('page:before-change');
+    return alertText;
+  });
 
-  function beforeunload() {
-    //Check if we are actually in report editor
-    if ( $(REPORT_CONTENT).length ) {
-      return alertText;
-    } else {
-      // We are at another page so remove unload handlers if they exists
-      $(window).off('beforeunload', beforeunload);
-      $(document).off('page:before-change', beforechange);
+  $(document).on("page:before-change", function() {
+    var exit;
+    exit = confirm(alertText);
+    if ( exit ) {
+      // We leave the page so remove all listeners
+      $(window).off('beforeunload');
+      $(document).off('page:before-change');
     }
-  }
-
-  function beforechange() {
-    //Check if we are actually in report editor
-    if ( $(REPORT_CONTENT).length ) {
-      var exit;
-      exit = confirm(alertText);
-      if ( exit ) {
-        // We leave the page so remove all listeners
-        $(window).off();
-        $(document).off();
-      }
-      return exit;
-    } else {
-      // We are at another page so remove unload handlers if they exists
-      $(window).off('beforeunload', beforeunload);
-      $(document).off('page:before-change', beforechange);
-    }
-  }
+    return exit;
+  });
 }
 
 /**
diff --git a/app/views/reports/index.html.erb b/app/views/reports/index.html.erb
index fb87a29e5..6b89ed57c 100644
--- a/app/views/reports/index.html.erb
+++ b/app/views/reports/index.html.erb
@@ -6,7 +6,7 @@
   data-reports-click-new-report-step-text="<%=t 'tutorial.reports_index_click_new_report_html' %>">
   <div>
     <% if can_create_new_report(@project) %>
-      <%= link_to new_project_reports_path(@project), class: "btn btn-primary", id: "new-report-btn" do %>
+      <%= link_to new_project_reports_path(@project), class: 'btn btn-primary', id: 'new-report-btn', 'data-no-turbolink' => true do %>
         <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
         <span class="hidden-xs"><%=t "projects.reports.index.new" %></span>
       <% end %>