From f0f36a7b02e5dece844929aafdb135614732425c Mon Sep 17 00:00:00 2001
From: Jason Etheridge <jason@esilibrary.com>
Date: Thu, 24 Jan 2013 17:30:26 -0500
Subject: [PATCH] move EventListenerList out of global_util.js

So that we can more easily pull it into main.xul (which we also do here)

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
---
 Open-ILS/xul/staff_client/Makefile.am         |  1 +
 .../chrome/content/OpenILS/event_util.js      | 37 +++++++++++++++++++
 .../chrome/content/OpenILS/global_util.js     | 37 -------------------
 .../content/OpenILS/util_overlay_chrome.xul   |  1 +
 .../content/OpenILS/util_overlay_offline.xul  |  1 +
 .../staff_client/chrome/content/main/main.xul |  1 +
 .../chrome/content/util/shell.html            |  1 +
 .../server/OpenILS/util_overlay.xul           |  1 +
 .../server/admin/printer_settings.xul         |  1 +
 .../server/admin/upload_xacts.xhtml           |  1 +
 Open-ILS/xul/staff_client/server/index.xhtml  |  2 +
 11 files changed, 47 insertions(+), 37 deletions(-)
 create mode 100644 Open-ILS/xul/staff_client/chrome/content/OpenILS/event_util.js

diff --git a/Open-ILS/xul/staff_client/Makefile.am b/Open-ILS/xul/staff_client/Makefile.am
index 2e165a689e..a27b5cb4c4 100644
--- a/Open-ILS/xul/staff_client/Makefile.am
+++ b/Open-ILS/xul/staff_client/Makefile.am
@@ -102,6 +102,7 @@ build_dir:
 	@cp build/chrome/content/main/bindings.xml build/server/main/bindings.xml
 	@cp build/chrome/content/OpenILS/data.js build/server/OpenILS/data.js
 	@cp build/chrome/content/OpenILS/global_util.js build/server/OpenILS/global_util.js
+	@cp build/chrome/content/OpenILS/event_util.js build/server/OpenILS/event_util.js
 	@if [ -d branding ]; then cp -fR branding/* build/; fi
 	@external/prune_dirs.sh build/
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/event_util.js b/Open-ILS/xul/staff_client/chrome/content/OpenILS/event_util.js
new file mode 100644
index 0000000000..39934b4529
--- /dev/null
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/event_util.js
@@ -0,0 +1,37 @@
+function EventListenerList() {
+    this._listeners = [];
+    return this;
+}
+
+EventListenerList.prototype = {
+    'add' : function(node, type, listener, useCapture) {
+        try {
+            node.addEventListener(type,listener,useCapture);
+            this._listeners.push({
+                'node' : node,
+                'type' : type,
+                'listener' : listener,
+                'useCapture' : useCapture
+            });
+        } catch(E) {
+            alert(location.href + ' Error adding event listener ' + type + ': ' + E);
+        }
+    },
+
+    'removeAll' : function() {
+        try {
+            if (typeof this._listeners != 'undefined') {
+                for (var i = 0; i < this._listeners.length; i++) {
+                    this._listeners[i].node.removeEventListener(
+                        this._listeners[i].type,
+                        this._listeners[i].listener,
+                        this._listeners[i].useCapture
+                    );
+                }
+            }
+        } catch(E) {
+            alert(location.href + ' Error in unloadEventListeners(): ' + E);
+        }
+    }
+}
+
diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js b/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
index f7abba410d..fabe682c72 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
@@ -2,43 +2,6 @@
         xulG = window.arguments[0];
     }
 
-    function EventListenerList() {
-        this._listeners = [];
-        return this;
-    }
-
-    EventListenerList.prototype = {
-        'add' : function(node, type, listener, useCapture) {
-            try {
-                node.addEventListener(type,listener,useCapture);
-                this._listeners.push({
-                    'node' : node,
-                    'type' : type,
-                    'listener' : listener,
-                    'useCapture' : useCapture
-                });
-            } catch(E) {
-                alert(location.href + ' Error adding event listener ' + type + ': ' + E);
-            }
-        },
-
-        'removeAll' : function() {
-            try {
-                if (typeof this._listeners != 'undefined') {
-                    for (var i = 0; i < this._listeners.length; i++) {
-                        this._listeners[i].node.removeEventListener(
-                            this._listeners[i].type,
-                            this._listeners[i].listener,
-                            this._listeners[i].useCapture
-                        );
-                    }
-                }
-            } catch(E) {
-                alert(location.href + ' Error in unloadEventListeners(): ' + E);
-            }
-        }
-    }
-
     function $(id) { return document.getElementById(id); }
 
     function oils_unsaved_data_V() {
diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
index c3b9e4772a..0860a6ddec 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
@@ -63,6 +63,7 @@
         <script type='text/javascript' src='util/en-US/OrgTree.js' />
         <script type="text/javascript" src="util/org_utils.js" />   
         <script type="text/javascript" src="global_util.js" />   
+        <script type="text/javascript" src="event_util.js" />   
         <messagecatalog id="offlineStrings" src='chrome://open_ils_staff_client/locale/offline.properties'/>
         <messagecatalog id="authStrings" src='chrome://open_ils_staff_client/locale/auth.properties'/>
         <hbox id="debug_box" hidden="true" flex="1" style="border: red thin dashed">
diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
index 2b834dbe54..a9dc1d8a64 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
@@ -60,6 +60,7 @@
         <script type="text/javascript" src="util/md5.js" />
         <script type="text/javascript" src="util/JSON_v1.js" />
         <script type="text/javascript" src="global_util.js" />   
+        <script type="text/javascript" src="event_util.js" />   
         <hbox id="debug_box" hidden="true" flex="1" style="border: red thin dashed">
             <label value="Debug:" />
             <textbox id="debug_tb" flex="1"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.xul b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
index 1ba82266b0..3884d9c18c 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
@@ -45,6 +45,7 @@
         <script type="text/javascript" src="../OpenILS/util/OrgTree.js" />
         -->
         <script type="text/javascript" src="../OpenILS/util/org_utils.js" />   
+        <script type="text/javascript" src="../OpenILS/event_util.js" />   
     </scripts>
     <script>dump('Loaded main/main.xul\n');</script>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/shell.html b/Open-ILS/xul/staff_client/chrome/content/util/shell.html
index 32a7cc2baf..884c48e174 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/shell.html
+++ b/Open-ILS/xul/staff_client/chrome/content/util/shell.html
@@ -8,6 +8,7 @@
 <script type="text/javascript" src="/xul/server/main/JSAN.js" />
 <script type="text/javascript" src="/xul/server/main/constants.js" />
 <script type="text/javascript" src="/xul/server/OpenILS/global_util.js" />
+<script type="text/javascript" src="/xul/server/OpenILS/event_util.js" />
 <script type="text/javascript" src="/xul/server/OpenILS/data.js" />
 <script type="text/javascript" src="/xul/server/util/network.js" />
 <script type="text/javascript" src="/xul/server/util/error.js" />
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 b4b81ac400..dec055d6ec 100644
--- a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
@@ -73,6 +73,7 @@
         <script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js' />
         <script type="text/javascript" src="/opac/common/js/org_utils.js" />   
         <script type="text/javascript" src="global_util.js" />   
+        <script type="text/javascript" src="event_util.js" />   
         <menupopup id="clipboard">
             <menuitem label="&common.textbox.cut;" oncommand="util.clipboard.cut()" />
             <menuitem label="&common.textbox.copy;" oncommand="util.clipboard.copy()" />
diff --git a/Open-ILS/xul/staff_client/server/admin/printer_settings.xul b/Open-ILS/xul/staff_client/server/admin/printer_settings.xul
index e8f61aed0a..6df759b972 100644
--- a/Open-ILS/xul/staff_client/server/admin/printer_settings.xul
+++ b/Open-ILS/xul/staff_client/server/admin/printer_settings.xul
@@ -23,6 +23,7 @@
     <script type="text/javascript" src="/opac/common/js/org_utils.js"></script>
 
     <script type="text/javascript" src="/xul/server/OpenILS/global_util.js"></script>
+    <script type="text/javascript" src="/xul/server/OpenILS/event_util.js"></script>
     <script type="text/javascript" src="/xul/server/main/constants.js"></script>
     <script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
     <script type="text/javascript" src="printer_settings.js"></script>
diff --git a/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml b/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
index eae0bbeb90..5f851c6959 100644
--- a/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
@@ -15,6 +15,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
     <script type="text/javascript" src="/xul/server/main/constants.js" />
     <script type="text/javascript" src="/xul/server/OpenILS/global_util.js" />
+    <script type="text/javascript" src="/xul/server/OpenILS/event_util.js" />
 
     <script type="text/javascript" src="/opac/common/js/utils.js" />
     <script type="text/javascript" src="/opac/common/js/CGI.js" />
diff --git a/Open-ILS/xul/staff_client/server/index.xhtml b/Open-ILS/xul/staff_client/server/index.xhtml
index 324c017ba3..1b36f3a698 100644
--- a/Open-ILS/xul/staff_client/server/index.xhtml
+++ b/Open-ILS/xul/staff_client/server/index.xhtml
@@ -73,6 +73,8 @@
   <script type="text/javascript" src="/opac/common/js/org_utils.js">
 </script>
   <script type="text/javascript" src="OpenILS/global_util.js">
+</script>
+  <script type="text/javascript" src="OpenILS/event_util.js">
 </script>
   <script type="text/javascript" src="main/JSAN.js">
 </script>
-- 
2.43.2