diff -r de56132c008d -r bdac73ed481e includes/clientside/static/admin-menu.js --- a/includes/clientside/static/admin-menu.js Sun Mar 28 21:49:26 2010 -0400 +++ b/includes/clientside/static/admin-menu.js Sun Mar 28 23:10:46 2010 -0400 @@ -24,20 +24,20 @@ if ( /admin_menu_state=/.test(document.cookie) ) { - var ck = (String(document.cookie).match(/admin_menu_state=([0-9]+)/))[1]; - if(ck) - { - ck = parseInt(ck); - } - else - { - ck = 0; - } - ck = ( isNaN(ck) ) ? 0 : ck; + var ck = (String(document.cookie).match(/admin_menu_state=([0-9]+)/))[1]; + if(ck) + { + ck = parseInt(ck); + } + else + { + ck = 0; + } + ck = ( isNaN(ck) ) ? 0 : ck; } else { - var ck = 0; + var ck = 0; } function tree (a_items, a_template, s_target) { @@ -63,26 +63,26 @@ } this.toggle = function (n_id,co) { var o_item = this.a_index[n_id]; o_item.open(o_item.b_opened,co); }; - this.open = function (n_id,co) { var o_item = this.a_index[n_id]; o_item.open(false,co); }; + this.open = function (n_id,co) { var o_item = this.a_index[n_id]; o_item.open(false,co); }; this.select = function (n_id) { return this.a_index[n_id].select(); }; this.mout = function (n_id) { this.a_index[n_id].upstatus(true) }; this.mover = function (n_id) { this.a_index[n_id].upstatus() }; this.a_children = []; for (var i = 0; i < a_items.length; i++) - { + { new tree_item(this, i); - } + } this.n_id = trees.length; trees[this.n_id] = this; for (var i = 0; i < this.a_children.length; i++) - { - if ( s_target ) - document.getElementById(s_target).innerHTML += this.a_children[i].init(); - else - document.write(this.a_children[i].init()); + { + if ( s_target ) + document.getElementById(s_target).innerHTML += this.a_children[i].init(); + else + document.write(this.a_children[i].init()); this.a_children[i].open(false, true); } } @@ -103,57 +103,57 @@ this.a_children = []; for (var i = 0; i < this.a_config.length - 2; i++) - { + { new tree_item(this, i); - } - + } + this.get_icon = item_get_icon; this.open = item_open; this.select = item_select; this.init = item_init; this.upstatus = item_upstatus; this.is_last = function () { return this.n_order == this.o_parent.a_children.length - 1 }; - - // CODE MODIFICATION - // added: - // Do we need to open the branch? - n = Math.pow(2, this.n_id); - var disp = ( ck & n ) ? true : false; - s = ( disp ) ? 'open' : 'closed'; - //if(s=='open') alert(this.n_id + ': ' + s); - if(disp) setTimeout('trees['+trees.length+'].open('+this.n_id+', true);', 10); - // END MODIFICATIONS + + // CODE MODIFICATION + // added: + // Do we need to open the branch? + n = Math.pow(2, this.n_id); + var disp = ( ck & n ) ? true : false; + s = ( disp ) ? 'open' : 'closed'; + //if(s=='open') alert(this.n_id + ': ' + s); + if(disp) setTimeout('trees['+trees.length+'].open('+this.n_id+', true);', 10); + // END MODIFICATIONS } function item_open (b_close, nocookie) { - //alert('item_open('+this.n_id+');'); + //alert('item_open('+this.n_id+');'); var o_idiv = get_element('i_div' + this.o_root.n_id + '_' + this.n_id); if (!o_idiv) return; if (!o_idiv.innerHTML) { var a_children = []; for (var i = 0; i < this.a_children.length; i++) - { + { a_children[i]= this.a_children[i].init(); - } + } o_idiv.innerHTML = a_children.join(''); } o_idiv.style.display = (b_close ? 'none' : 'block'); - - // CODE MODIFICATION - // added: - if(!nocookie) - { - // The idea here is to use a bitwise field. Nice 'n simple, right? Object of the game is to assemble - // a binary number that depicts the open/closed state of the entire menu in one cookie. - n = Math.pow(2, this.n_id); - ck = ( b_close ) ? ck-n : ck+n; - //alert('open(): doing the cookie routine for id '+this.n_id+"\nResult for bitwise op: "+ck); - createCookie('admin_menu_state', ck, 365); - } else { - //alert('open(): NOT doing the cookie routine for id '+this.n_id); - } - // END MODIFICATIONS + + // CODE MODIFICATION + // added: + if(!nocookie) + { + // The idea here is to use a bitwise field. Nice 'n simple, right? Object of the game is to assemble + // a binary number that depicts the open/closed state of the entire menu in one cookie. + n = Math.pow(2, this.n_id); + ck = ( b_close ) ? ck-n : ck+n; + //alert('open(): doing the cookie routine for id '+this.n_id+"\nResult for bitwise op: "+ck); + createCookie('admin_menu_state', ck, 365); + } else { + //alert('open(): NOT doing the cookie routine for id '+this.n_id); + } + // END MODIFICATIONS this.b_opened = !b_close; var o_jicon = document.images['j_img' + this.o_root.n_id + '_' + this.n_id], @@ -191,14 +191,14 @@ return '
' + (this.n_depth ? a_offset.join('') + (this.a_children.length ? '' : '') : '') - // CODE MODIFICATION - // [7/20/08: removed ondblclick property (unneeded)] - // removed: + // CODE MODIFICATION + // [7/20/08: removed ondblclick property (unneeded)] + // removed: // + '' + this.a_config[0] + '
' + (this.a_children.length ? '' : ''); - // added: - + '' + this.a_config[0] + '' + (this.a_children.length ? '' : ''); - // END MODIFICATIONS - alert('i_div' + this.o_root.n_id + '_' + this.n_id); + // added: + + '' + this.a_config[0] + '' + (this.a_children.length ? '' : ''); + // END MODIFICATIONS + alert('i_div' + this.o_root.n_id + '_' + this.n_id); } function item_get_icon (b_junction) { @@ -212,9 +212,9 @@ function addslashes(text) { - text = text.replace(/\\/g, '\\\\'); - text = text.replace(/"/g, '\\"'); - return text; + text = text.replace(/\\/g, '\\\\'); + text = text.replace(/"/g, '\\"'); + return text; } // ******************************************* @@ -223,81 +223,81 @@ function admin_table_onload(page) { - if ( page != namespace_list['Admin'] + 'GeneralConfig' ) - { - return true; - } - var collapse_state = admin_table_get_cookie(page); - if ( collapse_state == 0 ) - collapse_state = 0xffffffff; - $('#ajaxPageContainer > form > div.tblholder > table').each(function(i, table) - { - // skip if this is a one-row table - if ( $('tr:first', table).get(0) == $('tr:last', table).get(0) ) - return; - - var open = (collapse_state >> i) & 1 > 0 ? true : false; - - var ypos = open ? 0 : 12; - - var div = document.createElement('div'); - $(div).html(gen_sprite_html(scriptPath + '/themes/admin/images/thcollapse.png', 12, 12, ypos, 0)); - $(div).click(function() - { - admin_table_click(this); - }).css('cursor', 'pointer').css('float', 'right'); - div.thetable = table; - div.index = i; - div.thepage = page; - div.openstate = open; - $('tr > th:first', table).prepend(div); - if ( !open ) - admin_table_collapse(table, true); - }); + if ( page != namespace_list['Admin'] + 'GeneralConfig' ) + { + return true; + } + var collapse_state = admin_table_get_cookie(page); + if ( collapse_state == 0 ) + collapse_state = 0xffffffff; + $('#ajaxPageContainer > form > div.tblholder > table').each(function(i, table) + { + // skip if this is a one-row table + if ( $('tr:first', table).get(0) == $('tr:last', table).get(0) ) + return; + + var open = (collapse_state >> i) & 1 > 0 ? true : false; + + var ypos = open ? 0 : 12; + + var div = document.createElement('div'); + $(div).html(gen_sprite_html(scriptPath + '/themes/admin/images/thcollapse.png', 12, 12, ypos, 0)); + $(div).click(function() + { + admin_table_click(this); + }).css('cursor', 'pointer').css('float', 'right'); + div.thetable = table; + div.index = i; + div.thepage = page; + div.openstate = open; + $('tr > th:first', table).prepend(div); + if ( !open ) + admin_table_collapse(table, true); + }); } function admin_table_click(mydiv) { - var table = mydiv.thetable; - var i = mydiv.index; - var page = mydiv.thepage; - var collapse_state = admin_table_get_cookie(page); - - if ( mydiv.openstate ) - { - $('img', mydiv).css('background-position', '0px -12px'); - var new_collapse_state = collapse_state & ~Math.pow(2, i); - console.debug(new_collapse_state); - mydiv.openstate = false; - admin_table_collapse(table); - } - else - { - $('img', mydiv).css('background-position', '0px 0px'); - var new_collapse_state = collapse_state | Math.pow(2, i); - console.debug(new_collapse_state); - mydiv.openstate = true; - admin_table_expand(table); - } - createCookie('admin_th:' + page, new_collapse_state, 3650); + var table = mydiv.thetable; + var i = mydiv.index; + var page = mydiv.thepage; + var collapse_state = admin_table_get_cookie(page); + + if ( mydiv.openstate ) + { + $('img', mydiv).css('background-position', '0px -12px'); + var new_collapse_state = collapse_state & ~Math.pow(2, i); + console.debug(new_collapse_state); + mydiv.openstate = false; + admin_table_collapse(table); + } + else + { + $('img', mydiv).css('background-position', '0px 0px'); + var new_collapse_state = collapse_state | Math.pow(2, i); + console.debug(new_collapse_state); + mydiv.openstate = true; + admin_table_expand(table); + } + createCookie('admin_th:' + page, new_collapse_state, 3650); } function admin_table_get_cookie(page) { - var cookievalue = parseInt(readCookie('admin_th:' + page)); - if ( isNaN(cookievalue) ) - cookievalue = 0; - return cookievalue; + var cookievalue = parseInt(readCookie('admin_th:' + page)); + if ( isNaN(cookievalue) ) + cookievalue = 0; + return cookievalue; } function admin_table_collapse(table, noanim) { - var targetheight = $('tr > th:first', table).height(); - $('tr', table).hide(); - $('tr:first', table).show(); + var targetheight = $('tr > th:first', table).height(); + $('tr', table).hide(); + $('tr:first', table).show(); } function admin_table_expand(table) { - $('tr', table).show(); + $('tr', table).show(); }