From 1712fc0611098c99d2451d2897c19b7c2ae606a9 Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Mon, 5 Jun 2017 17:10:13 +0200 Subject: [PATCH 1/2] Fix bug with protocol preview modal not working in protocol repo Closes SCI-1323. --- app/assets/javascripts/protocols/index.js | 4 ++-- app/assets/javascripts/protocols/steps.js.erb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/protocols/index.js b/app/assets/javascripts/protocols/index.js index 13960bbec..5b040c9e0 100644 --- a/app/assets/javascripts/protocols/index.js +++ b/app/assets/javascripts/protocols/index.js @@ -209,9 +209,9 @@ function initProtocolPreviewModal() { modalTitle.html(data.title); modalBody.html(data.html); modalFooter.html(data.footer); - initHandsOnTable(modalBody); + window.initHandsOnTable(modalBody); modal.modal("show"); - initHandsOnTable(modalBody); + window.initHandsOnTable(modalBody); initPreviewModal(); }, error: function (error) { diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb index e236eb124..af687ee30 100644 --- a/app/assets/javascripts/protocols/steps.js.erb +++ b/app/assets/javascripts/protocols/steps.js.erb @@ -673,4 +673,5 @@ }); }) + window.initHandsOnTable = initHandsOnTable; })(window); From f382c04f012c9cdd85ebd82d2973e9e58d03279c Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Tue, 6 Jun 2017 08:02:01 +0200 Subject: [PATCH 2/2] Refactor JS code a bit Closes SCI-1323. --- app/assets/javascripts/protocols/index.js | 4 ++-- app/assets/javascripts/protocols/steps.js.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/protocols/index.js b/app/assets/javascripts/protocols/index.js index 5b040c9e0..13960bbec 100644 --- a/app/assets/javascripts/protocols/index.js +++ b/app/assets/javascripts/protocols/index.js @@ -209,9 +209,9 @@ function initProtocolPreviewModal() { modalTitle.html(data.title); modalBody.html(data.html); modalFooter.html(data.footer); - window.initHandsOnTable(modalBody); + initHandsOnTable(modalBody); modal.modal("show"); - window.initHandsOnTable(modalBody); + initHandsOnTable(modalBody); initPreviewModal(); }, error: function (error) { diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb index af687ee30..25ad4cbf6 100644 --- a/app/assets/javascripts/protocols/steps.js.erb +++ b/app/assets/javascripts/protocols/steps.js.erb @@ -673,5 +673,5 @@ }); }) - window.initHandsOnTable = initHandsOnTable; + global.initHandsOnTable = initHandsOnTable; })(window);