From 198612a9759f4b20b69bcf71db290e62a6923559 Mon Sep 17 00:00:00 2001 From: phasefx Date: Fri, 29 Jun 2007 17:53:14 +0000 Subject: [PATCH] fix the offline isodate library loading bug git-svn-id: svn://svn.open-ils.org/ILS/trunk@7494 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../staff_client/chrome/content/main/constants.js | 3 ++- .../xul/staff_client/chrome/content/util/date.js | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Open-ILS/xul/staff_client/chrome/content/main/constants.js b/Open-ILS/xul/staff_client/chrome/content/main/constants.js index 94c9ce6fb6..4006b8b39b 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/constants.js +++ b/Open-ILS/xul/staff_client/chrome/content/main/constants.js @@ -181,7 +181,8 @@ const urls = { 'org_tree' : '/opac/common/js/OrgTree.js', 'browser' : '/opac/en-US/skin/default/xml/advanced.xml', 'fieldmapper' : '/opac/common/js/fmall.js', - 'isodate_lib' : '/opac/common/js/DP_DateExtensions.js', + 'isodate_lib_remote' : '/opac/common/js/DP_DateExtensions.js', + 'isodate_lib_local' : 'chrome://open_ils_staff_client/content/OpenILS/util/DP_DateExtensions.js', 'xsl_marc2html' : '/opac/extras/xsl/oilsMARC21slim2HTML.xsl', 'AUDIO_GOOD_SOUND' : '/xul/server/skin/media/audio/bonus.wav', diff --git a/Open-ILS/xul/staff_client/chrome/content/util/date.js b/Open-ILS/xul/staff_client/chrome/content/util/date.js index 19a88cb7c7..aea0f44b3b 100644 --- a/Open-ILS/xul/staff_client/chrome/content/util/date.js +++ b/Open-ILS/xul/staff_client/chrome/content/util/date.js @@ -88,9 +88,23 @@ util.date.formatted_date = function (orig_date,format) { var s = format; if (s == '') { s = '%F %H:%M'; } if (typeof _date.iso8601Format != 'function') { - - var js = JSAN._loadJSFromUrl( urls.isodate_lib ); - try { eval( js ); } catch(E) { alert('Problem loading ISO8601 date extension:' + E); } + + try { + var js = JSAN._loadJSFromUrl( urls.isodate_lib_remote ); + eval( js ); + + } catch(E) { + + try { + var js = JSAN._loadJSFromUrl( urls.isodate_lib_local ); + eval( js ); + + } catch(F) { + + alert('Problem loading ISO8601 date extension:' + E + '\n' + F); + + } + } } if (typeof _date.iso8601Format == 'function') { -- 2.11.0