Merge pull request #853 from sparc-request/kg-proper_navigation_bug

KG - Navigation Bug (System Satisfaction JS Handler)
sparc-request · Jan 10, 2017 · a793935 · a793935
2 parents f624b9e + 3b83ddf
commit a793935
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 26 deletions.
diff --git a/app/assets/javascripts/system_satisfaction.js.coffee b/app/assets/javascripts/system_satisfaction.js.coffee
@@ -19,28 +19,28 @@
 # TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 $(document).ready ->
-survey_offered = false
-
-$(document).on 'click', '.get-a-cost-estimate, .form-submit-button', (event) ->
-  button = $(this)
-
-  if !survey_offered
-    event.preventDefault()
-    $('#modal_place').html($('#participate-in-survey-modal').html())
-    $('#modal_place').modal('show')
-
-    $(document).on 'click', '#modal_place .yes-button', ->
-      survey_offered = true
-      $('#modal_place').load "/surveys/system-satisfaction-survey", {survey_version: ""}, ->
-        $('#survey_form').append("<input type='hidden' id='redirect_to' name='redirect_to' value='#{button.attr('href')}'>")
-        $('#survey_form div.next_section').append("<input type='button' name='cancel' value='Cancel'/>")
-
-      $(document).on 'click', '#survey-submit-button', (event) ->
-        event.preventDefault()
-        $("textarea:hidden").val("")
-        $('#survey_form').append("<input type='hidden' id='finish' name='finish' value='Submit'>")
-        $(this).attr('disabled', true)
-        $('#survey_form').submit()
-
-    $(document).on 'click', '#modal_place .no-button', ->
-      window.location = button.attr('href')
+  survey_offered = false
+
+  $(document).on 'click', '.get-a-cost-estimate, .form-submit-button', (event) ->
+    button = $(this)
+
+    if !survey_offered
+      event.preventDefault()
+      $('#modal_place').html($('#participate-in-survey-modal').html())
+      $('#modal_place').modal('show')
+
+      $(document).on 'click', '#modal_place .yes-button', ->
+        survey_offered = true
+        $('#modal_place').load "/surveys/system-satisfaction-survey", {survey_version: ""}, ->
+          $('#survey_form').append("<input type='hidden' id='redirect_to' name='redirect_to' value='#{button.attr('href')}'>")
+          $('#survey_form div.next_section').append("<input type='button' name='cancel' value='Cancel'/>")
+
+        $(document).on 'click', '#survey-submit-button', (event) ->
+          event.preventDefault()
+          $("textarea:hidden").val("")
+          $('#survey_form').append("<input type='hidden' id='finish' name='finish' value='Submit'>")
+          $(this).attr('disabled', true)
+          $('#survey_form').submit()
+
+      $(document).on 'click', '#modal_place .no-button', ->
+        window.location = button.attr('href')
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -57,7 +57,6 @@
     = render 'shared/modal'
 
 - if SYSTEM_SATISFACTION_SURVEY
-  = javascript_include_tag 'system_satisfaction'
   = stylesheet_link_tag('surveyor/reset',
                         'surveyor/jquery-ui-1.10.0.custom',
                         'surveyor/jquery-ui-timepicker-addon',

diff --git a/app/views/service_requests/review.html.haml b/app/views/service_requests/review.html.haml
@@ -33,5 +33,6 @@
 = render 'service_requests/navigation/footer', service_request: @service_request, css_class: @css_class, back: @back, forward: @forward
 
 - if SYSTEM_SATISFACTION_SURVEY
+  = javascript_include_tag 'system_satisfaction'
   = hidden_field_tag :use_system_satisfaction, 'true'
   = render 'service_requests/modals/participate_in_survey_modal'