From f164ba93a3e35ffa37ac8830dbdb670443eb8a77 Mon Sep 17 00:00:00 2001 From: Ethan Finlay Date: Wed, 26 Jun 2019 17:19:23 -0400 Subject: [PATCH 1/2] rebasing --- public/assets/js/default.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/public/assets/js/default.js b/public/assets/js/default.js index b47264390..a4d8f34a3 100755 --- a/public/assets/js/default.js +++ b/public/assets/js/default.js @@ -284,6 +284,17 @@ $doc.on('resize', function(){ resizeFrame(); }); +<<<<<<< HEAD +======= +// Open error-preview links in new tab +$doc.ready(function(){ + $('body').on('click', '.error-preview > a', function(){ + window.open($(this).attr('href')); + return false; + }); +}); + +>>>>>>> ce66233... Requested feature is complete // END update UFIXIT Preview on load $doc.ready(function() { resizeFrame(); From df3cc1397a91e2be69ec4db9636506b75ce35561 Mon Sep 17 00:00:00 2001 From: Ethan Finlay Date: Wed, 26 Jun 2019 17:20:54 -0400 Subject: [PATCH 2/2] rebasing --- public/assets/js/default.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/public/assets/js/default.js b/public/assets/js/default.js index a4d8f34a3..882fe1d97 100755 --- a/public/assets/js/default.js +++ b/public/assets/js/default.js @@ -284,8 +284,6 @@ $doc.on('resize', function(){ resizeFrame(); }); -<<<<<<< HEAD -======= // Open error-preview links in new tab $doc.ready(function(){ $('body').on('click', '.error-preview > a', function(){ @@ -294,7 +292,6 @@ $doc.ready(function(){ }); }); ->>>>>>> ce66233... Requested feature is complete // END update UFIXIT Preview on load $doc.ready(function() { resizeFrame();