From 2eb0db61af3da3c00bb42f4e434733f01fe40757 Mon Sep 17 00:00:00 2001 From: dbs Date: Tue, 28 Jul 2009 13:40:37 +0000 Subject: [PATCH] Backport r13749 from trunk: Attempt to avoid clashes with browsers that treat 'delete' as a reserved JavaScript keyword git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_0@13754 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/js/dojo/openils/PermaCrud.js | 8 ++++++++ Open-ILS/web/opac/skin/default/js/rdetail.js | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Open-ILS/web/js/dojo/openils/PermaCrud.js b/Open-ILS/web/js/dojo/openils/PermaCrud.js index a6d7a873ba..5e4f49be4f 100644 --- a/Open-ILS/web/js/dojo/openils/PermaCrud.js +++ b/Open-ILS/web/js/dojo/openils/PermaCrud.js @@ -296,6 +296,14 @@ if(!dojo._hasResource["openils.PermaCrud"]) { this._CUD( 'delete', list, opts ); }, + /* + * 'delete' is a reserved keyword in JavaScript and can't be used + * in browsers like IE or Chrome, so we define a safe synonym + */ + eliminate: function ( list, opts ) { + this._CUD( 'delete', list, opts ); + }, + apply : function ( list, opts ) { this._auto_CUD( list, opts ); }, diff --git a/Open-ILS/web/opac/skin/default/js/rdetail.js b/Open-ILS/web/opac/skin/default/js/rdetail.js index a41c61cf2e..66df72319f 100644 --- a/Open-ILS/web/opac/skin/default/js/rdetail.js +++ b/Open-ILS/web/opac/skin/default/js/rdetail.js @@ -305,7 +305,7 @@ function _holdingsDrawMFHD(holdings, entryNum) { var pcrud = new openils.PermaCrud({"authtoken": G.user.session}); var mfhd_rec = pcrud.retrieve("sre", holdings.id()); if (mfhd_rec) { - pcrud.delete(mfhd_rec); + pcrud.eliminate(mfhd_rec); alert(dojo.string.substitute(opac_strings.DELETED_MFHD_RECORD, [holdings.id()])); } }, label:opac_strings.DELETE_MFHD}).placeAt(mfhd_edit, "last"); -- 2.11.0