Bill has a browser.js; let's be careful

git-svn-id: svn://svn.open-ils.org/ILS/trunk@872 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/browser.js b/Evergreen/staff_client/chrome/content/evergreen/util/browser.js
deleted file mode 100644 (file)
index db89a83..0000000
--- a/Evergreen/staff_client/chrome/content/evergreen/util/browser.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Modified by Jason for Evergreen
-
-function startEvergreenStaffClient() {
-       if (! window.open('chrome://evergreen/content/','auth_win','chrome') )
-               alert('Could not start Evergreen');
-}
-
-function startEvergreenOPAC() {
-       var text = evergreenGetSelectedText();
-       var url = 'http://gapines.org/';
-       if (text) {
-               url = 'http://gapines.org/opac/'
-               + '?target=mr_result'
-               + '&mr_search_type=keyword'
-               + '&mr_search_query=' + encodeURIComponent( text )
-               + '&mr_search_location=1'
-               + '&mr_search_depth=0'
-               + '&page=0'
-               + '&sub_frame=1';
-       }
-       if (! window.open(url,'gapines.org') )
-               alert('Could not load http://gapines.org/');
-}
-
-function evergreenGetSelectedText() {
-       var node = document.popupNode;
-       var selection = "";
-       var nodeLocalName = node.localName.toUpperCase();
-       if ((nodeLocalName == "TEXTAREA") || (nodeLocalName == "INPUT" && node.type == "text")) {
-               selection = node.value.substring(node.selectionStart, node.selectionEnd);
-       } 
-       else {
-               var focusedWindow = new XPCNativeWrapper(document.commandDispatcher.focusedWindow, 'document', 'getSelection()');
-               selection = focusedWindow.getSelection().toString();
-       }
-       selection = selection.replace(/(^\s+)|(\s+$)/g, "");
-
-       return selection;
-}
-

diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/browser_overlay.js b/Evergreen/staff_client/chrome/content/evergreen/util/browser_overlay.js
new file mode 100644 (file)
index 0000000..db89a83
--- /dev/null
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/browser_overlay.js
@@ -0,0 +1,40 @@
+// Modified by Jason for Evergreen
+
+function startEvergreenStaffClient() {
+       if (! window.open('chrome://evergreen/content/','auth_win','chrome') )
+               alert('Could not start Evergreen');
+}
+
+function startEvergreenOPAC() {
+       var text = evergreenGetSelectedText();
+       var url = 'http://gapines.org/';
+       if (text) {
+               url = 'http://gapines.org/opac/'
+               + '?target=mr_result'
+               + '&mr_search_type=keyword'
+               + '&mr_search_query=' + encodeURIComponent( text )
+               + '&mr_search_location=1'
+               + '&mr_search_depth=0'
+               + '&page=0'
+               + '&sub_frame=1';
+       }
+       if (! window.open(url,'gapines.org') )
+               alert('Could not load http://gapines.org/');
+}
+
+function evergreenGetSelectedText() {
+       var node = document.popupNode;
+       var selection = "";
+       var nodeLocalName = node.localName.toUpperCase();
+       if ((nodeLocalName == "TEXTAREA") || (nodeLocalName == "INPUT" && node.type == "text")) {
+               selection = node.value.substring(node.selectionStart, node.selectionEnd);
+       } 
+       else {
+               var focusedWindow = new XPCNativeWrapper(document.commandDispatcher.focusedWindow, 'document', 'getSelection()');
+               selection = focusedWindow.getSelection().toString();
+       }
+       selection = selection.replace(/(^\s+)|(\s+$)/g, "");
+
+       return selection;
+}
+

diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/browser_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/util/browser_overlay.xul
index 0d5e552..5c44d10 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/util/browser_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/browser_overlay.xul
@@ -4,7 +4,7 @@
 <overlay id="util"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-       <script src="chrome://evergreen/content/util/browser.js"/>
+       <script src="chrome://evergreen/content/util/browser_overlay.js"/>
 
        <popup id="contentAreaContextMenu">
                <menuitem id="evergreen_right_click_menu"