[open-ils-commits] r13875 - branches/rel_1_4/Open-ILS/xul/staff_client/server/cat (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-08-19 04:02:02 -0400 (Wed, 19 Aug 2009)
New Revision: 13875

Modified:
   branches/rel_1_4/Open-ILS/xul/staff_client/server/cat/marcedit.js
   branches/rel_1_4/Open-ILS/xul/staff_client/server/cat/marcedit.xul
Log:
backport part of changeset 12252 for font_helper support, but really as a pre-requisite to porting the new clipboard context menus

Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/cat/marcedit.js
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/cat/marcedit.js	2009-08-19 03:09:17 UTC (rev 13874)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/cat/marcedit.js	2009-08-19 08:02:02 UTC (rev 13875)
@@ -80,6 +80,12 @@
 
 function my_init() {
 	try {
+
+        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+        if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+        JSAN.errorLevel = "die"; // none, warn, or die
+        JSAN.addRepository('/xul/server/');
+
 		// Fake xulG for standalone...
 		try {
 			window.xulG.record;
@@ -225,7 +231,6 @@
 
 		loadRecord(xml_record);
 
-
 	} catch(E) {
 		alert('FIXME, MARC Editor, my_init: ' + E);
 	}

Modified: branches/rel_1_4/Open-ILS/xul/staff_client/server/cat/marcedit.xul
===================================================================
--- branches/rel_1_4/Open-ILS/xul/staff_client/server/cat/marcedit.xul	2009-08-19 03:09:17 UTC (rev 13874)
+++ branches/rel_1_4/Open-ILS/xul/staff_client/server/cat/marcedit.xul	2009-08-19 08:02:02 UTC (rev 13875)
@@ -9,15 +9,17 @@
 <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xhtml="http://www.w3.org/1999/xhtml" onload="my_init()">
+<?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xhtml="http://www.w3.org/1999/xhtml" onload="try { my_init(); font_helper(); } catch(E) { alert(E); }">
+
+<scripts id="openils_util_scripts"/>
+<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
+
 <script src="marcedit.js" type="application/x-javascript; e4x=1"/>
-<script src="/opac/common/js/CGI.js" type="application/x-javascript; e4x=1"/>
-<script src="/opac/common/js/JSON_v1.js" type="application/x-javascript; e4x=1"/>
 
 <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-<messagecatalog id="commonStrings" src="/xul/server/locale/<!--#echo var='locale'-->/common.properties" />
 
 <groupbox flex="0">
 	<caption label="&staff.cat.marcedit.options.label;"/>