From: Mike Rylander Date: Tue, 10 Jan 2017 17:10:58 +0000 (-0500) Subject: webstaff: Protect some ACQ interfaces from XUL-ish calls X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=055bf28964ef99d3eacd8889a4f30974fb914e26;p=working%2FEvergreen.git webstaff: Protect some ACQ interfaces from XUL-ish calls Signed-off-by: Mike Rylander Signed-off-by: Galen Charlton Signed-off-by: Kathy Lussier --- diff --git a/Open-ILS/web/js/ui/default/acq/common/inv_dialog.js b/Open-ILS/web/js/ui/default/acq/common/inv_dialog.js index 6ef5126611..95ca98a5b6 100644 --- a/Open-ILS/web/js/ui/default/acq/common/inv_dialog.js +++ b/Open-ILS/web/js/ui/default/acq/common/inv_dialog.js @@ -11,7 +11,7 @@ function InvoiceLinkDialogManager(which, target) { var join = (idx == 0) ? '?' : '&'; path += join + "attach_" + self.which + "=" + id; }); - if (openils.XUL.isXUL()) { + if (openils.XUL.isXUL() && !window.IAMBROWSER) { openils.XUL.newTabEasy( path, /* tab title */ dojo.string.substitute( diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js index 7a34720d66..818a576681 100644 --- a/Open-ILS/web/js/ui/default/acq/common/li_table.js +++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js @@ -3158,7 +3158,7 @@ function AcqLiTable() { } var path = oilsBasePath + '/acq/invoice/view?create=1'; dojo.forEach(liIds, function(li, idx) { path += '&attach_li=' + li }); - if (openils.XUL.isXUL()) + if (openils.XUL.isXUL() && !window.IAMBROWSER) openils.XUL.newTabEasy(path, localeStrings.NEW_INVOICE, null, true); else location.href = path; diff --git a/Open-ILS/web/js/ui/default/acq/invoice/view.js b/Open-ILS/web/js/ui/default/acq/invoice/view.js index 4fbc16a846..9ac5e25a05 100644 --- a/Open-ILS/web/js/ui/default/acq/invoice/view.js +++ b/Open-ILS/web/js/ui/default/acq/invoice/view.js @@ -275,7 +275,7 @@ function performSearch(pageDir, clearFirst) { var searchObject = termManager.buildSearchObject(); - if (openils.XUL.isXUL()) { + if (openils.XUL.isXUL() && !window.IAMBROWSER) { cookieSvc.setCookieString(cookieUriSSL, null, "invs=" + base64Encode(searchObject) + ';max-age=2592000', null); @@ -373,7 +373,7 @@ function renderUnifiedSearch() { var searchObject, searchConjunction; - if (openils.XUL.isXUL()) { + if (openils.XUL.isXUL() && !window.IAMBROWSER) { if (!cookieSvc) {