From 01f83a5b525addd0e2a2b944173772f3fe2a6221 Mon Sep 17 00:00:00 2001 From: erickson Date: Mon, 27 Feb 2006 14:56:13 +0000 Subject: [PATCH] fixing typos.., small tweaks, re-enabled the timeout alert git-svn-id: svn://svn.open-ils.org/ILS/trunk@3194 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/common/js/opac_utils.js | 17 ++--- Open-ILS/web/opac/common/js/utils.js | 62 ++++++++++++++++++- .../web/opac/locale/en-US/opac_common.dtd | 3 +- .../default/xml/myopac/myopac_summary.xml | 4 ++ .../web/opac/skin/default/xml/page_myopac.xml | 2 +- 5 files changed, 73 insertions(+), 15 deletions(-) diff --git a/Open-ILS/web/opac/common/js/opac_utils.js b/Open-ILS/web/opac/common/js/opac_utils.js index b2293923a1..b0dcec71ca 100644 --- a/Open-ILS/web/opac/common/js/opac_utils.js +++ b/Open-ILS/web/opac/common/js/opac_utils.js @@ -292,7 +292,7 @@ function grabUser(ses, force) { var at = getAuthtime(); if(isXUL()) at = xulG['authtime']; - //new AuthTimer(at).run(); /* needs debugging... */ + new AuthTimer(at).run(); /* needs debugging... */ return G.user; } @@ -469,14 +469,12 @@ function unHideMe(obj) { removeCSSClass(obj, config.css.hide_me); } /* build the org tree */ /* ----------------------------------------------------------------------- */ function drawOrgTree() { - //G.ui.common.org_tree.innerHTML = buildOrgSelector().toString(); - //buildOrgSelector(G.ui.common.org_tree, orgTreeSelector); - setTimeout( 'buildOrgSelector(G.ui.common.org_tree, orgTreeSelector);', 10 ); + //setTimeout( 'buildOrgSelector(G.ui.common.org_tree, orgTreeSelector);', 10 ); + setTimeout( 'buildOrgSelector(G.ui.common.org_tree, orgTreeSelector);', 1 ); } var orgTreeSelector; function buildOrgSelector(node) { - //var tree = new dTree("orgTreeSelector"); var tree = new SlimTree(node,'orgTreeSelector'); orgTreeSelector = tree; for( var i in orgArraySearcher ) { @@ -650,13 +648,8 @@ AuthTimer.prototype.run = function() { } function _authTimerAlert() { - if( confirm( $('auth_session_expiring').innerHTML ) ) - doLogout(); - else { - if(!grabUser(null, true)) { - alert($('auth_session_expired').innerHTML); - } - } + alert( $('auth_session_expiring').innerHTML ); + if(!grabUser(null, true)) doLogout(); } diff --git a/Open-ILS/web/opac/common/js/utils.js b/Open-ILS/web/opac/common/js/utils.js index 1bb3bb333b..f9a3db554f 100644 --- a/Open-ILS/web/opac/common/js/utils.js +++ b/Open-ILS/web/opac/common/js/utils.js @@ -184,6 +184,23 @@ function getSelectorVal( sel ) { return v; } +function getSelectorName( sel ) { + var o = sel.options[sel.selectedIndex]; + var v = o.name; + if(v == null || v == undefined || v == "") v = o.innerHTML; + return v; +} + +function setSelectorByName( sel, name ) { + for( var o in sel.options ) { + var opt = sel.options[o]; + if( opt.name == name || opt.innerHTML == name ) { + sel.selectedIndex = o; + opt.selected = true; + } + } +} + function debugSelector(sel) { var s = 'Selector\n'; for( var i = 0; i != sel.options.length; i++ ) { @@ -193,6 +210,45 @@ function debugSelector(sel) { return s; } +function findParentByNodeName(node, name) { + while( ( node = node.parentNode) ) + if (node.nodeName == name) return node; + return null; +} + +/* returns only elements in nodes childNodes list, not sub-children */ +function getElementsByTagNameFlat( node, name ) { + var elements = []; + for( var e in node.childNodes ) { + var n = node.childNodes[e]; + if( n && n.nodeName == name ) elements.push(n); + } + return elements; +} + +/* expects a tree with a id() method on each node and a +children() method to get to each node */ +function findTreeItemById( tree, id ) { + if( tree.id() == id ) return tree; + for( var c in tree.children() ) { + var found = findTreeItemById( tree.children()[c], id ); + if(found) return found; + } + return null; +} + +/* returns null if none of the tests are true. returns sub-array of +matching array items otherwise */ +function grep( arr, func ) { + var results = []; + for( var i in arr ) { + if( func(arr[i]) ) + results.push(arr[i]); + } + if(results.length > 0) return results; + return null; +} + function doSelectorActions(sel) { if(IE && sel) { sel.onchange = function() { @@ -209,10 +265,12 @@ function insertSelectorVal( selector, index, name, value, action, indent ) { for( var i = selector.options.length; i != index; i-- ) a[i] = selector.options[i-1]; - setSelectorVal( selector, index, name, value, action, indent ); + var opt = setSelectorVal( selector, index, name, value, action, indent ); for( var i = index + 1; i < a.length; i++ ) selector.options[i] = a[i]; + + return opt; } function setSelectorVal( selector, index, name, value, action, indent ) { @@ -220,6 +278,7 @@ function setSelectorVal( selector, index, name, value, action, indent ) { indent = parseInt(indent); var option; + if(IE) { var pre = elem("pre"); for( var i = 0; i != indent; i++ ) @@ -239,6 +298,7 @@ function setSelectorVal( selector, index, name, value, action, indent ) { } option.onclick = action; + return option; } diff --git a/Open-ILS/web/opac/locale/en-US/opac_common.dtd b/Open-ILS/web/opac/locale/en-US/opac_common.dtd index 06126a4663..4d0f166367 100644 --- a/Open-ILS/web/opac/locale/en-US/opac_common.dtd +++ b/Open-ILS/web/opac/locale/en-US/opac_common.dtd @@ -9,7 +9,7 @@ + "Your login session will timeout in 1 minute unless there is activity"> @@ -64,4 +64,5 @@ + diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml index 7283900f61..31ec037f1e 100644 --- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml +++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml @@ -137,8 +137,12 @@ +

+ + diff --git a/Open-ILS/web/opac/skin/default/xml/page_myopac.xml b/Open-ILS/web/opac/skin/default/xml/page_myopac.xml index 65962a951e..a5d550a871 100644 --- a/Open-ILS/web/opac/skin/default/xml/page_myopac.xml +++ b/Open-ILS/web/opac/skin/default/xml/page_myopac.xml @@ -46,7 +46,7 @@
Addresses