From e23be6cc0e6a54f9498d0fecce4de3be30b42ea3 Mon Sep 17 00:00:00 2001 From: zmagod Date: Fri, 9 Dec 2016 15:26:41 +0100 Subject: [PATCH 1/2] fixed step description links [fixes SCI-780] --- app/assets/javascripts/protocols/steps.js.erb | 3 +++ app/assets/javascripts/sitewide/quill_links.js | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb index 9dbb8b598..e7ab33441 100644 --- a/app/assets/javascripts/protocols/steps.js.erb +++ b/app/assets/javascripts/protocols/steps.js.erb @@ -80,6 +80,7 @@ function applyCancelCallBack() { setTimeout(function() { initStepsComments(); + openLinksInNewEab(); }, 1000); }) @@ -111,6 +112,7 @@ function applyEditCallBack() { $("#new-step-main-tab a").on("shown.bs.tab", function() { $("#step_name").focus(); }); + openLinksInNewEab(); }); } @@ -181,6 +183,7 @@ function formCallback($form) { setTimeout(function() { initStepsComments(); + openLinksInNewEab(); }, 1000); return true; }); diff --git a/app/assets/javascripts/sitewide/quill_links.js b/app/assets/javascripts/sitewide/quill_links.js index 870275010..92094407e 100644 --- a/app/assets/javascripts/sitewide/quill_links.js +++ b/app/assets/javascripts/sitewide/quill_links.js @@ -1,5 +1,6 @@ //= require quill + // Globally overwrite links handling in Quill rich text editor var Link = Quill.import('formats/link'); Link.sanitize = function(url) { @@ -8,3 +9,16 @@ Link.sanitize = function(url) { } return 'http://' + url; }; + +function openLinksInNewEab() { + _.each($('.ql-editor a'), function(el) { + debugger; + if ($(el).attr('target') !== '_blank') { + $(el).attr('target', '_blank'); + } + }); +} + +$(document).ready(function(){ + openLinksInNewEab(); +}); From 50c9dd3f5936d1046673d86890cec544a494ea04 Mon Sep 17 00:00:00 2001 From: zmagod Date: Wed, 14 Dec 2016 14:40:56 +0100 Subject: [PATCH 2/2] fixed typo --- app/assets/javascripts/protocols/steps.js.erb | 6 +++--- app/assets/javascripts/sitewide/quill_links.js | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb index e7ab33441..997b3a86b 100644 --- a/app/assets/javascripts/protocols/steps.js.erb +++ b/app/assets/javascripts/protocols/steps.js.erb @@ -80,7 +80,7 @@ function applyCancelCallBack() { setTimeout(function() { initStepsComments(); - openLinksInNewEab(); + openLinksInNewTab(); }, 1000); }) @@ -112,7 +112,7 @@ function applyEditCallBack() { $("#new-step-main-tab a").on("shown.bs.tab", function() { $("#step_name").focus(); }); - openLinksInNewEab(); + openLinksInNewTab(); }); } @@ -183,7 +183,7 @@ function formCallback($form) { setTimeout(function() { initStepsComments(); - openLinksInNewEab(); + openLinksInNewTab(); }, 1000); return true; }); diff --git a/app/assets/javascripts/sitewide/quill_links.js b/app/assets/javascripts/sitewide/quill_links.js index 92094407e..c1bd7ffc7 100644 --- a/app/assets/javascripts/sitewide/quill_links.js +++ b/app/assets/javascripts/sitewide/quill_links.js @@ -10,9 +10,8 @@ Link.sanitize = function(url) { return 'http://' + url; }; -function openLinksInNewEab() { +function openLinksInNewTab() { _.each($('.ql-editor a'), function(el) { - debugger; if ($(el).attr('target') !== '_blank') { $(el).attr('target', '_blank'); } @@ -20,5 +19,5 @@ function openLinksInNewEab() { } $(document).ready(function(){ - openLinksInNewEab(); + openLinksInNewTab(); });