[open-ils-commits] r18713 - in branches/rel_2_0/Open-ILS: web/conify/global/actor web/conify/global/config web/conify/global/permission web/js/ui web/opac/common/js web/opac/extras web/opac/extras/circ web/opac/extras/selfcheck web/opac/skin/craftsman/js web/opac/skin/default/js web/opac/skin/default/xml/common web/reports web/reports/xul xul/staff_client/server/admin xul/staff_client/server/main xul/staff_client/server/patron (phasefx)
svn at svn.open-ils.org
svn at svn.open-ils.org
Fri Nov 12 13:00:12 EST 2010
Author: phasefx
Date: 2010-11-12 13:00:08 -0500 (Fri, 12 Nov 2010)
New Revision: 18713
Modified:
branches/rel_2_0/Open-ILS/web/conify/global/actor/org_unit.html
branches/rel_2_0/Open-ILS/web/conify/global/actor/org_unit.js
branches/rel_2_0/Open-ILS/web/conify/global/actor/org_unit_type.html
branches/rel_2_0/Open-ILS/web/conify/global/actor/org_unit_type.js
branches/rel_2_0/Open-ILS/web/conify/global/config/copy_status.html
branches/rel_2_0/Open-ILS/web/conify/global/config/copy_status.js
branches/rel_2_0/Open-ILS/web/conify/global/config/marc_code_maps.html
branches/rel_2_0/Open-ILS/web/conify/global/permission/grp_tree.html
branches/rel_2_0/Open-ILS/web/conify/global/permission/grp_tree.js
branches/rel_2_0/Open-ILS/web/conify/global/permission/perm_list.html
branches/rel_2_0/Open-ILS/web/conify/global/permission/perm_list.js
branches/rel_2_0/Open-ILS/web/js/ui/base.js
branches/rel_2_0/Open-ILS/web/opac/common/js/RemoteRequest.js
branches/rel_2_0/Open-ILS/web/opac/common/js/opac_utils.js
branches/rel_2_0/Open-ILS/web/opac/extras/bbags.xml
branches/rel_2_0/Open-ILS/web/opac/extras/circ/alt_holds_print.html
branches/rel_2_0/Open-ILS/web/opac/extras/selfcheck/selfcheck.js
branches/rel_2_0/Open-ILS/web/opac/extras/selfcheck/selfcheck.xml
branches/rel_2_0/Open-ILS/web/opac/skin/craftsman/js/sidebar.js
branches/rel_2_0/Open-ILS/web/opac/skin/default/js/adv_global.js
branches/rel_2_0/Open-ILS/web/opac/skin/default/js/mresult.js
branches/rel_2_0/Open-ILS/web/opac/skin/default/js/rresult.js
branches/rel_2_0/Open-ILS/web/opac/skin/default/js/sidebar.js
branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
branches/rel_2_0/Open-ILS/web/reports/oils_rpt.js
branches/rel_2_0/Open-ILS/web/reports/oils_rpt_common.xhtml
branches/rel_2_0/Open-ILS/web/reports/xul/template_builder.xul
branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
branches/rel_2_0/Open-ILS/xul/staff_client/server/main/data.xul
branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/ue.xhtml
Log:
merge r18687 from trunk for cookie library changes
Modified: branches/rel_2_0/Open-ILS/web/conify/global/actor/org_unit.html
===================================================================
--- branches/rel_2_0/Open-ILS/web/conify/global/actor/org_unit.html 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/conify/global/actor/org_unit.html 2010-11-12 18:00:08 UTC (rev 18713)
@@ -48,7 +48,6 @@
<!-- The OpenSRF API writ JS -->
<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
- <script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
Modified: branches/rel_2_0/Open-ILS/web/conify/global/actor/org_unit.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/conify/global/actor/org_unit.js 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/conify/global/actor/org_unit.js 2010-11-12 18:00:08 UTC (rev 18713)
@@ -20,6 +20,7 @@
dojo.require('openils.widget.TranslatorPopup');
dojo.require('openils.PermaCrud');
dojo.require('dojo.parser');
+dojo.require('dojo.cookie');
dojo.require('dojo.data.ItemFileWriteStore');
dojo.require('dojo.date.stamp');
dojo.require('dijit.form.TextBox');
@@ -38,8 +39,7 @@
// some handy globals
var cgi = new CGI();
-var cookieManager = new HTTP.Cookies();
-var ses = cookieManager.read('ses') || cgi.param('ses');
+var ses = dojo.cookie('ses') || cgi.param('ses');
var pcrud = new openils.PermaCrud({ authtoken : ses });
var current_ou, current_ou_hoo, ou_list_store;
Modified: branches/rel_2_0/Open-ILS/web/conify/global/actor/org_unit_type.html
===================================================================
--- branches/rel_2_0/Open-ILS/web/conify/global/actor/org_unit_type.html 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/conify/global/actor/org_unit_type.html 2010-11-12 18:00:08 UTC (rev 18713)
@@ -50,7 +50,6 @@
<!-- The OpenSRF API writ JS -->
<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
- <script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
Modified: branches/rel_2_0/Open-ILS/web/conify/global/actor/org_unit_type.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/conify/global/actor/org_unit_type.js 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/conify/global/actor/org_unit_type.js 2010-11-12 18:00:08 UTC (rev 18713)
@@ -20,6 +20,7 @@
dojo.require('openils.widget.TranslatorPopup');
dojo.require('openils.PermaCrud');
dojo.require('dojo.parser');
+dojo.require('dojo.cookie');
dojo.require('dojo.data.ItemFileWriteStore');
dojo.require('dojo.date.stamp');
dojo.require('dijit.form.NumberSpinner');
@@ -39,8 +40,7 @@
// some handy globals
var cgi = new CGI();
-var cookieManager = new HTTP.Cookies();
-var ses = cookieManager.read('ses') || cgi.param('ses');
+var ses = dojo.cookie('ses') || cgi.param('ses');
var pCRUD = new openils.PermaCrud({authtoken:ses});
var current_type;
Modified: branches/rel_2_0/Open-ILS/web/conify/global/config/copy_status.html
===================================================================
--- branches/rel_2_0/Open-ILS/web/conify/global/config/copy_status.html 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/conify/global/config/copy_status.html 2010-11-12 18:00:08 UTC (rev 18713)
@@ -51,7 +51,6 @@
<!-- The OpenSRF API writ JS -->
<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
- <script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
Modified: branches/rel_2_0/Open-ILS/web/conify/global/config/copy_status.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/conify/global/config/copy_status.js 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/conify/global/config/copy_status.js 2010-11-12 18:00:08 UTC (rev 18713)
@@ -22,6 +22,7 @@
dojo.require('dojo.parser');
dojo.require('dojo.string');
dojo.require('dojo.data.ItemFileWriteStore');
+dojo.require('dojo.cookie');
dojo.require('dijit.form.TextBox');
dojo.require('dijit.form.ValidationTextBox');
dojo.require('dijit.form.Textarea');
@@ -35,8 +36,7 @@
// some handy globals
var cgi = new CGI();
-var cookieManager = new HTTP.Cookies();
-var ses = cookieManager.read('ses') || cgi.param('ses');
+var ses = dojo.cookie('ses') || cgi.param('ses');
var pCRUD = new openils.PermaCrud({authtoken:ses});
var current_status;
Modified: branches/rel_2_0/Open-ILS/web/conify/global/config/marc_code_maps.html
===================================================================
--- branches/rel_2_0/Open-ILS/web/conify/global/config/marc_code_maps.html 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/conify/global/config/marc_code_maps.html 2010-11-12 18:00:08 UTC (rev 18713)
@@ -51,7 +51,6 @@
<!-- The OpenSRF API writ JS -->
<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
- <script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
Modified: branches/rel_2_0/Open-ILS/web/conify/global/permission/grp_tree.html
===================================================================
--- branches/rel_2_0/Open-ILS/web/conify/global/permission/grp_tree.html 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/conify/global/permission/grp_tree.html 2010-11-12 18:00:08 UTC (rev 18713)
@@ -61,7 +61,6 @@
<!-- The OpenSRF API writ JS -->
<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
- <script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
Modified: branches/rel_2_0/Open-ILS/web/conify/global/permission/grp_tree.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/conify/global/permission/grp_tree.js 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/conify/global/permission/grp_tree.js 2010-11-12 18:00:08 UTC (rev 18713)
@@ -22,6 +22,7 @@
dojo.require('dojo.parser');
dojo.require('dojo.data.ItemFileWriteStore');
dojo.require('dojo.date.stamp');
+dojo.require('dojo.cookie');
dojo.require('dijit.form.NumberSpinner');
dojo.require('dijit.form.TextBox');
dojo.require('dijit.form.TimeTextBox');
@@ -43,8 +44,7 @@
// some handy globals
var cgi = new CGI();
-var cookieManager = new HTTP.Cookies();
-var ses = cookieManager.read('ses') || cgi.param('ses');
+var ses = dojo.cookie('ses') || cgi.param('ses');
var server = {};
server.pcrud = new openils.PermaCrud({ authtoken : ses });
server.actor = new OpenSRF.ClientSession('open-ils.actor');
Modified: branches/rel_2_0/Open-ILS/web/conify/global/permission/perm_list.html
===================================================================
--- branches/rel_2_0/Open-ILS/web/conify/global/permission/perm_list.html 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/conify/global/permission/perm_list.html 2010-11-12 18:00:08 UTC (rev 18713)
@@ -51,7 +51,6 @@
<!-- The OpenSRF API writ JS -->
<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
- <script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
Modified: branches/rel_2_0/Open-ILS/web/conify/global/permission/perm_list.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/conify/global/permission/perm_list.js 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/conify/global/permission/perm_list.js 2010-11-12 18:00:08 UTC (rev 18713)
@@ -21,6 +21,7 @@
dojo.require('openils.PermaCrud');
dojo.require('dojo.parser');
dojo.require('dojo.string');
+dojo.require('dojo.cookie');
dojo.require('dojo.data.ItemFileWriteStore');
dojo.require('dijit.form.TextBox');
dojo.require('dijit.form.ValidationTextBox');
@@ -35,8 +36,7 @@
// some handy globals
var cgi = new CGI();
-var cookieManager = new HTTP.Cookies();
-var ses = cookieManager.read('ses') || cgi.param('ses');
+var ses = dojo.cookie('ses') || cgi.param('ses');
var pCRUD = new openils.PermaCrud({authtoken : ses});
var ppl_strings = dojo.i18n.getLocalization('openils.conify', 'conify');
Modified: branches/rel_2_0/Open-ILS/web/js/ui/base.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/js/ui/base.js 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/js/ui/base.js 2010-11-12 18:00:08 UTC (rev 18713)
@@ -37,8 +37,8 @@
if(!authtoken) {
- dojo.cookie('ses', openils.User.authtoken, {expires:-1, path:'/'}); // remove the cookie
- dojo.cookie('ses', openils.User.authtoken, {expires:-1, path:oilsBasePath}); // remove the cookie
+ dojo.cookie('ses', null, {expires:-1, path:'/'}); // remove the cookie
+ dojo.cookie('ses', null, {expires:-1, path:oilsBasePath}); // remove the cookie
dojo.addOnLoad(function(){
if(openils.XUL.isXUL()) {
Modified: branches/rel_2_0/Open-ILS/web/opac/common/js/RemoteRequest.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/common/js/RemoteRequest.js 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/opac/common/js/RemoteRequest.js 2010-11-12 18:00:08 UTC (rev 18713)
@@ -244,7 +244,7 @@
try {
var auth;
- try { auth = cookieManager.read(COOKIE_SES) } catch(ee) {}
+ try { dojo.require('dojo.cookie'); auth = dojo.cookie(COOKIE_SES) } catch(ee) {}
if( isXUL() ) auth = fetchXULStash().session.key;
if( auth )
this.xmlhttp.setRequestHeader('X-OILS-Authtoken', auth);
Modified: branches/rel_2_0/Open-ILS/web/opac/common/js/opac_utils.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/common/js/opac_utils.js 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/opac/common/js/opac_utils.js 2010-11-12 18:00:08 UTC (rev 18713)
@@ -5,8 +5,6 @@
function isXUL() { try { if(IAMXUL) return true;}catch(e){return false;}; }
-var cookieManager = new HTTP.Cookies();
-
var __ilsEvent; /* the last event the occurred */
var DEBUGSLIM;
@@ -222,13 +220,14 @@
function initCookies() {
+ dojo.require('dojo.cookie');
FONTSIZE = "regular";
- var font = cookieManager.read(COOKIE_FONT);
+ var font = dojo.cookie(COOKIE_FONT);
scaleFonts(font);
if(font) FONTSIZE = font;
- SKIN = cookieManager.read(COOKIE_SKIN);
+ SKIN = dojo.cookie(COOKIE_SKIN);
if(findCurrentPage() == HOME)
- cookieManager.remove(COOKIE_SEARCH);
+ dojo.cookie(COOKIE_SEARCH,null,{'expires':-1});
}
/* URL param accessors */
@@ -522,7 +521,7 @@
}
function setSessionCookie(ses) {
- cookieManager.write(COOKIE_SES, ses, -1);
+ dojo.cookie(COOKIE_SES, ses);
}
@@ -544,7 +543,7 @@
}
if(!ses) {
- ses = cookieManager.read(COOKIE_SES);
+ ses = dojo.cookie(COOKIE_SES);
/* https cookies don't show up in http servers.. */
_debug("cookie auth token = " + ses);
}
@@ -636,8 +635,8 @@
G.user = req.result();
if(!G.user || G.user.length == 0) {
+ dojo.cookie(COOKIE_SES,null,{'expires':-1});
G.user = null; return false;
- cookieManager.write(COOKIE_SES,"");
}
G.user.session = ses;
@@ -661,7 +660,7 @@
if(grabUser()) {
if(grabUserPrefs()) {
user_skin = G.user.prefs["opac.skin"];
- cookieManager.write( COOKIE_SKIN, user_skin, '+1y' );
+ dojo.cookie( COOKIE_SKIN, user_skin, { 'expires' : 365 } );
}
}
}
@@ -794,10 +793,10 @@
/* remove any cached data */
dojo.require('dojo.cookie');
- dojo.cookie(COOKIE_SES, '', {expires:-1});
- dojo.cookie(COOKIE_RIDS, '', {expires:-1});
- dojo.cookie(COOKIE_SKIN, '', {expires:-1});
- dojo.cookie(COOKIE_SEARCH, '', {expires:-1});
+ dojo.cookie(COOKIE_SES, null, {expires:-1});
+ dojo.cookie(COOKIE_RIDS, null, {expires:-1});
+ dojo.cookie(COOKIE_SKIN, null, {expires:-1});
+ dojo.cookie(COOKIE_SEARCH, null, {expires:-1});
checkUserSkin("default");
@@ -887,7 +886,7 @@
function setFontSize(size) {
scaleFonts(size);
- cookieManager.write(COOKIE_FONT, size, '+1y');
+ dojo.cookie(COOKIE_FONT, size, { 'expires' : 365});
}
var resourceFormats = [
Modified: branches/rel_2_0/Open-ILS/web/opac/extras/bbags.xml
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/extras/bbags.xml 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/opac/extras/bbags.xml 2010-11-12 18:00:08 UTC (rev 18713)
@@ -11,7 +11,6 @@
<script language='javascript' src='/opac/common/js/utils.js'> </script>
<script language='javascript' src='/opac/common/js//config.js'> </script>
<script language='javascript' src='/opac/common/js/CGI.js'> </script>
- <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
<script language='javascript' src='/opac/common/js/slimtree.js'> </script>
<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
Modified: branches/rel_2_0/Open-ILS/web/opac/extras/circ/alt_holds_print.html
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/extras/circ/alt_holds_print.html 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/opac/extras/circ/alt_holds_print.html 2010-11-12 18:00:08 UTC (rev 18713)
@@ -26,7 +26,6 @@
</style>
<!-- The OpenSRF API writ JS -->
<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
- <script language='javascript' src='/opac/common/js/Cookies.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
<!-- Dojo goodness -->
Modified: branches/rel_2_0/Open-ILS/web/opac/extras/selfcheck/selfcheck.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/extras/selfcheck/selfcheck.js 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/opac/extras/selfcheck/selfcheck.js 2010-11-12 18:00:08 UTC (rev 18713)
@@ -45,8 +45,9 @@
function selfckInit() {
+ dojo.require('dojo.cookie');
var cgi = new CGI();
- var staff = grabUser(cookieManager.read(STAFF_SES_PARAM) || cgi.param(STAFF_SES_PARAM));
+ var staff = grabUser(dojo.cookie(STAFF_SES_PARAM) || cgi.param(STAFF_SES_PARAM));
selfckSetupPrinter();
@@ -122,9 +123,9 @@
}
function selfckTryPatronCookie() {
- var pb = cookieManager.read(PATRON_BARCODE_COOKIE);
+ var pb = dojo.cookie(PATRON_BARCODE_COOKIE);
if(pb) {
- cookieManager.write(PATRON_BARCODE_COOKIE, '');
+ dojo.cookie(PATRON_BARCODE_COOKIE, null, {'expires':-1});
$('selfck-patron-login-input').value = pb;
selfckPatronLogin();
}
@@ -245,7 +246,7 @@
}
function selfckLogoutStaff() {
- cookieManager.remove(STAFF_SES_PARAM);
+ dojo.cookie(STAFF_SES_PARAM,null,{'expires':-1});
location.reload(true);
}
@@ -256,7 +257,7 @@
function selfckCheckPatronBarcode(itemBc) {
if(patronBarcodeRegex) {
if(itemBc.match(patronBarcodeRegex)) {
- cookieManager.write(PATRON_BARCODE_COOKIE, itemBc, -1);
+ dojo.cookie(PATRON_BARCODE_COOKIE, itemBc);
selfckLogoutPatron();
return true;
}
Modified: branches/rel_2_0/Open-ILS/web/opac/extras/selfcheck/selfcheck.xml
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/extras/selfcheck/selfcheck.xml 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/opac/extras/selfcheck/selfcheck.xml 2010-11-12 18:00:08 UTC (rev 18713)
@@ -39,8 +39,6 @@
<script language='javascript' type='text/javascript'
src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/CGI.js'></script>
<script language='javascript' type='text/javascript'
- src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/Cookies.js'></script>
- <script language='javascript' type='text/javascript'
src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/md5.js'></script>
<script language='javascript' type='text/javascript'
src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/JSON_v1.js'></script>
Modified: branches/rel_2_0/Open-ILS/web/opac/skin/craftsman/js/sidebar.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/skin/craftsman/js/sidebar.js 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/opac/skin/craftsman/js/sidebar.js 2010-11-12 18:00:08 UTC (rev 18713)
@@ -68,7 +68,8 @@
if(!strongPassword( G.ui.login.password.value ) ) {
- cookieManager.write(COOKIE_SES, "");
+ dojo.require('dojo.cookie');
+ dojo.cookie(COOKIE_SES, "");
hideMe($('login_table'));
unHideMe($('change_pw_table'));
$('change_pw_current').focus();
Modified: branches/rel_2_0/Open-ILS/web/opac/skin/default/js/adv_global.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/skin/default/js/adv_global.js 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/opac/skin/default/js/adv_global.js 2010-11-12 18:00:08 UTC (rev 18713)
@@ -8,7 +8,8 @@
function advgInit() {
/* XXX */
- if( cookieManager.read(COOKIE_NOGROUP_RECORDS) || SHOW_MR_DEFAULT )
+ dojo.require('dojo.cookie');
+ if( dojo.cookie(COOKIE_NOGROUP_RECORDS) || SHOW_MR_DEFAULT )
$('adv_group_titles').checked = true;
$n($('adv_global_tbody'), 'term').focus();
@@ -112,7 +113,7 @@
/* loads the compiled search from the search cookie
and sets the widgets accordingly */
- search = cookieManager.read(COOKIE_SEARCH);
+ search = dojo.cookie(COOKIE_SEARCH);
if(!search) return;
_debug("loaded compiled search cookie: " + search);
@@ -260,9 +261,9 @@
}
if($('adv_group_titles').checked )
- cookieManager.write(COOKIE_NOGROUP_RECORDS,'1',-1);
+ dojo.cookie(COOKIE_NOGROUP_RECORDS,'1');
else
- cookieManager.write(COOKIE_NOGROUP_RECORDS,'');
+ dojo.cookie(COOKIE_NOGROUP_RECORDS,null,{'expires':-1});
goTo(buildOPACLink(args));
Modified: branches/rel_2_0/Open-ILS/web/opac/skin/default/js/mresult.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/skin/default/js/mresult.js 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/opac/skin/default/js/mresult.js 2010-11-12 18:00:08 UTC (rev 18713)
@@ -49,7 +49,8 @@
var res = r.getResultObject();
resultFacetKey = res.facet_key;
resultCompiledSearch = res.compiled_search;
- cookieManager.write(COOKIE_SEARCH, js2JSON(res.compiled_search), -1);
+ dojo.require('dojo.cookie');
+ dojo.cookie(COOKIE_SEARCH, js2JSON(res.compiled_search));
if(res.count != null) {
if( getOffset() == 0 ) HITCOUNT = res.count;
runEvt('result', 'hitCountReceived');
Modified: branches/rel_2_0/Open-ILS/web/opac/skin/default/js/rresult.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/skin/default/js/rresult.js 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/opac/skin/default/js/rresult.js 2010-11-12 18:00:08 UTC (rev 18713)
@@ -38,7 +38,7 @@
switch(rtype) {
case RTYPE_COOKIE:
- ids = JSON2js(cookieManager.read(COOKIE_RIDS));
+ ids = JSON2js(dojo.cookie(COOKIE_RIDS));
_rresultHandleIds( ids, ids.length );
break;
@@ -245,7 +245,7 @@
function _rresultHandleIds(ids, count) {
//var json = js2JSON({ids:ids,count:count});
/*
- cookieManager.write(COOKIE_SRIDS, json, '+1d');
+ dojo.cookie(COOKIE_SRIDS, json, {'expires':1});
*/
HITCOUNT = parseInt(count);
@@ -321,7 +321,8 @@
resultFacetKey = result.facet_key;
resultCompiledSearch = result.compiled_search;
- cookieManager.write(COOKIE_SEARCH, js2JSON(result.compiled_search), -1);
+ dojo.require('dojo.cookie');
+ dojo.cookie(COOKIE_SEARCH, js2JSON(result.compiled_search));
_rresultHandleIds( ids, result.count );
}
Modified: branches/rel_2_0/Open-ILS/web/opac/skin/default/js/sidebar.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/skin/default/js/sidebar.js 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/opac/skin/default/js/sidebar.js 2010-11-12 18:00:08 UTC (rev 18713)
@@ -68,7 +68,8 @@
if(!strongPassword( G.ui.login.password.value ) ) {
- cookieManager.write(COOKIE_SES, "");
+ dojo.require('dojo.cookie');
+ dojo.cookie(COOKIE_SES, "");
hideMe($('login_table'));
unHideMe($('change_pw_table'));
$('change_pw_current').focus();
Modified: branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/common/js_common.xml 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/common/js_common.xml 2010-11-12 18:00:08 UTC (rev 18713)
@@ -1,7 +1,6 @@
<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js' type='text/javascript'></script>
<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/config.js' type='text/javascript'></script>
<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/CGI.js' type='text/javascript'></script>
- <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/Cookies.js' type='text/javascript'></script>
<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/md5.js' type='text/javascript'></script>
<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/slimtree.js' type='text/javascript'></script>
Modified: branches/rel_2_0/Open-ILS/web/reports/oils_rpt.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/reports/oils_rpt.js 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/reports/oils_rpt.js 2010-11-12 18:00:08 UTC (rev 18713)
@@ -23,10 +23,10 @@
}
- oilsRptCookie = new HTTP.Cookies();
+ dojo.require('dojo.cookie');
oilsRptCurrentOrg = USER.ws_ou();
- cookieManager.write(COOKIE_SES, SESSION, -1, '/');
- cookieManager.write('ws_ou', USER.ws_ou(), -1, '/');
+ dojo.cookie(COOKIE_SES, SESSION, { 'path' : '/'});
+ dojo.cookie('ws_ou', USER.ws_ou(), { 'path' : '/'});
oilsRptFetchOrgTree(
function() {
Modified: branches/rel_2_0/Open-ILS/web/reports/oils_rpt_common.xhtml
===================================================================
--- branches/rel_2_0/Open-ILS/web/reports/oils_rpt_common.xhtml 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/reports/oils_rpt_common.xhtml 2010-11-12 18:00:08 UTC (rev 18713)
@@ -14,6 +14,7 @@
<script type="text/javascript">
dojo.require('dojo.parser');
dojo.require('dojo.string');
+ dojo.require('dojo.cookie');
function status_update (markup) {
dojo.byId('status_text').innerHTML = markup;
@@ -27,7 +28,6 @@
<script type='text/javascript' src='/opac/common/js/JSON_v1.js'> </script>
<script type='text/javascript' src='/opac/common/js/fmall.js'> </script>
<script type='text/javascript' src='/opac/common/js/fmgen.js'> </script>
-<script type='text/javascript' src='/opac/common/js/Cookies.js'> </script>
<script type='text/javascript' src='/opac/common/js/opac_utils.js'> </script>
<script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script type='text/javascript' src='/opac/common/js/org_utils.js'> </script>
Modified: branches/rel_2_0/Open-ILS/web/reports/xul/template_builder.xul
===================================================================
--- branches/rel_2_0/Open-ILS/web/reports/xul/template_builder.xul 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/web/reports/xul/template_builder.xul 2010-11-12 18:00:08 UTC (rev 18713)
@@ -36,7 +36,6 @@
<script src='/opac/common/js/JSON_v1.js' type="application/x-javascript; e4x=1"/>
<script src='/opac/common/js/fmall.js' type="application/x-javascript; e4x=1"/>
<script src='/opac/common/js/fmgen.js' type="application/x-javascript; e4x=1"/>
-<script src='/opac/common/js/Cookies.js' type="application/x-javascript; e4x=1"/>
<script src='/opac/common/js/opac_utils.js' type="application/x-javascript; e4x=1"/>
<script src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js' type="application/x-javascript; e4x=1"/>
<script src='/opac/common/js/org_utils.js' type="application/x-javascript; e4x=1"/>
Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml 2010-11-12 18:00:08 UTC (rev 18713)
@@ -18,7 +18,6 @@
<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
<script language='javascript' src='/opac/common/js/fmall.js'> </script>
<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
- <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml 2010-11-12 18:00:08 UTC (rev 18713)
@@ -16,7 +16,6 @@
<script type='text/javascript' src='/opac/common/js/JSON_v1.js'> </script>
<script type='text/javascript' src='/opac/common/js/fmall.js'> </script>
<script type='text/javascript' src='/opac/common/js/fmgen.js'> </script>
- <script type='text/javascript' src='/opac/common/js/Cookies.js'> </script>
<script type='text/javascript' src='/opac/common/js/opac_utils.js'> </script>
<script type='text/javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script type='text/javascript' src='/opac/common/js/org_utils.js'> </script>
Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml 2010-11-12 18:00:08 UTC (rev 18713)
@@ -22,7 +22,6 @@
<script language='javascript' src='/opac/common/js/Cookie.js'> </script>
<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
- <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml 2010-11-12 18:00:08 UTC (rev 18713)
@@ -20,7 +20,6 @@
<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
<script language='javascript' src='/opac/common/js/fmall.js'> </script>
<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
- <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml 2010-11-12 18:00:08 UTC (rev 18713)
@@ -19,7 +19,6 @@
<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
<script language='javascript' src='/opac/common/js/fmall.js'> </script>
<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
- <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml 2010-11-12 18:00:08 UTC (rev 18713)
@@ -18,7 +18,6 @@
<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
<script language='javascript' src='/opac/common/js/fmall.js'> </script>
<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
- <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml 2010-11-12 18:00:08 UTC (rev 18713)
@@ -18,7 +18,6 @@
<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
<script language='javascript' src='/opac/common/js/fmall.js'> </script>
<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
- <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/main/data.xul
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/main/data.xul 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/main/data.xul 2010-11-12 18:00:08 UTC (rev 18713)
@@ -129,8 +129,6 @@
//cache_me('/xul/server/patron/ue_ui.js','http');
//cache_me('/xul/server/patron/ue.js','http');
//cache_me('/opac/common/js//config.js','http');
- //cache_me('/opac/common/js/Cookie.js','http');
- //cache_me('/opac/common/js/Cookies.js','http');
//cache_me('/opac/common/js/opac_utils.js','http');
//cache_me('/opac/common/js/init.js','http');
//cache_me('/opac/common/js/jscalendar/calendar-brown.css','http');
Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/ue.xhtml
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/ue.xhtml 2010-11-12 13:55:58 UTC (rev 18712)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/ue.xhtml 2010-11-12 18:00:08 UTC (rev 18713)
@@ -18,7 +18,6 @@
<script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
<script language='javascript' src='/opac/common/js/fmall.js'> </script>
<script language='javascript' src='/opac/common/js/fmgen.js'> </script>
- <script language='javascript' src='/opac/common/js/Cookies.js'> </script>
<script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
<script language='javascript' src='/opac/common/js/<!--#echo var="locale"-->/OrgTree.js'> </script>
<script language='javascript' src='/opac/common/js/org_utils.js'> </script>
More information about the open-ils-commits
mailing list