From bf5b8ec53deb0e4a78a4239fa04c9c519963923c Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 16 Jul 2010 18:28:27 +0000
Subject: [PATCH] get rid of the chrome instantiated sound object so it's every
interface for itself, and have remote xul load server/skin/custom.js instead
of chrome
git-svn-id: svn://svn.open-ils.org/ILS/trunk@16965 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
Open-ILS/xul/staff_client/chrome/content/main/menu.js | 4 +---
Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul | 1 +
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu.js b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
index 9c9282f4ee..bcda2645f1 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
@@ -10,7 +10,6 @@ main.menu = function () {
offlineStrings = document.getElementById('offlineStrings');
JSAN.use('util.error'); this.error = new util.error();
JSAN.use('util.window'); this.window = new util.window();
- JSAN.use('util.sound'); this.sound = new util.sound({'interval':500,'sig':'menu_constructor'});
JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
this.w = window;
@@ -155,7 +154,7 @@ main.menu.prototype = {
netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
mframe.xulG = xulG;
/* This window should get its own objects for these */
- delete mframe.xulG['_sound']; delete mframe.xulG['_data'];
+ delete mframe.xulG['_data'];
}
],
'cmd_new_tab' : [
@@ -1606,7 +1605,6 @@ main.menu.prototype = {
if (e) { e.setAttribute('label',text); }
};
content_params.chrome_xulG = xulG;
- content_params._sound = xulG._sound;
content_params._data = xulG._data;
return content_params;
diff --git a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
index eb38d43e77..c5b669ea07 100644
--- a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
@@ -60,6 +60,7 @@
<button label="js2JSON" oncommand="try { var dtb = document.getElementById('debug_tb'); alert( js2JSON( eval( dtb.value ) ) ); } catch(E) { alert(E); }; dtb.focus();"/>
</hbox>
<keyset><key id="debug_box_key" keycode="VK_F7" modifiers="control,shift" oncommand="var dtb = document.getElementById('debug_tb'); var dx = document.getElementById('debug_box'); dx.hidden = !dx.hidden; if (!dx.hidden) dtb.focus();"/></keyset>
+ <script type="text/javascript" src="/xul/server/skin/custom.js" />
<script>dump('finished openils_util_overlay\n');</script>
</scripts>
--
2.11.0