From 0d3d46c5b035ed7561bd1335d72caa61bd1046d8 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Fri, 20 Feb 2015 10:28:04 -0500 Subject: [PATCH] Make sure res link doesn't open new window update the external.js file in js/custom --- js/app.js | 6 +++--- js/custom/external.js | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/js/app.js b/js/app.js index 095b1a1..d7d2096 100644 --- a/js/app.js +++ b/js/app.js @@ -13,8 +13,6 @@ d=c?e.S(c).closest("["+this.attr_name()+"]"):e.S("["+this.attr_name()+"]");var f $('a').each(function() { var urlPattern = new RegExp('/' + window.location.host + '/'); - //console.log($(this).attr('href')); - //console.log($(this).attr('href').indexOf("javascript")); if( !urlPattern.test(this.href) && !$(this).hasClass('thickbox') && !$(this).hasClass('colorbox') @@ -23,6 +21,7 @@ $('a').each(function() { && !$(this).hasClass('photoimg') && ($(this).attr('href') != "#") && ($(this).attr('href') != "") + && ($(this).attr('href') != "https://reservations.troutcreek.com/irmnet/res/resmain.aspx") && ($(this).attr('href') != null) && ($(this).attr('href').indexOf("javascript") == -1) ) { @@ -32,7 +31,8 @@ $('a').each(function() { window.open(this.href, '_blank'); }); } -});;// Load foundation +}); +;// Load foundation $(document).foundation(); $(document).ready(function () { //$('ul.children').each(function () { diff --git a/js/custom/external.js b/js/custom/external.js index 22d4a08..9b7c4ab 100755 --- a/js/custom/external.js +++ b/js/custom/external.js @@ -5,8 +5,6 @@ $('a').each(function() { var urlPattern = new RegExp('/' + window.location.host + '/'); - //console.log($(this).attr('href')); - //console.log($(this).attr('href').indexOf("javascript")); if( !urlPattern.test(this.href) && !$(this).hasClass('thickbox') && !$(this).hasClass('colorbox') @@ -15,6 +13,7 @@ $('a').each(function() { && !$(this).hasClass('photoimg') && ($(this).attr('href') != "#") && ($(this).attr('href') != "") + && ($(this).attr('href') != "https://reservations.troutcreek.com/irmnet/res/resmain.aspx") && ($(this).attr('href') != null) && ($(this).attr('href').indexOf("javascript") == -1) ) { @@ -24,4 +23,4 @@ $('a').each(function() { window.open(this.href, '_blank'); }); } -}); \ No newline at end of file +}); -- 2.17.1