From: <rob...@us...> - 2010-10-15 22:37:53
|
Revision: 30063 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=30063&view=rev Author: robertplummer Date: 2010-10-15 22:37:47 +0000 (Fri, 15 Oct 2010) Log Message: ----------- [ADD] The event handlers for checking the values of each of the revision selectors in sheet history Modified Paths: -------------- branches/6.x/lib/sheet/tiki-history_sheets.js branches/6.x/tiki-history_sheets.php Modified: branches/6.x/lib/sheet/tiki-history_sheets.js =================================================================== --- branches/6.x/lib/sheet/tiki-history_sheets.js 2010-10-15 22:24:34 UTC (rev 30062) +++ branches/6.x/lib/sheet/tiki-history_sheets.js 2010-10-15 22:37:47 UTC (rev 30063) @@ -53,6 +53,16 @@ after.attr('disabled', 'true'); } +function setValuesForCompareSheet(value1, value2) { + value1 = (value1 ? ":eq(" + value1 + ")" : ":first"); + value2 = (value2 ? ":eq(" + value2 + ")" : ":last"); + + $("input.compareSheet1").filter(value1).click(); + $("input.compareSheet2").filter(value2).click(); + + compareSheetClick(); +} + $(function () { $('#go_fullscreen').toggle(function() { $('<div id="tiki_sheet_container_fullscreen" />') @@ -64,9 +74,9 @@ .html($('#tiki_sheet_container').children()) .css('z-index', '999999') .prependTo($('body')); - }, function() { - $('#tiki_sheet_container') - .children($('#tiki_sheet_container_fullscreen').children()); - $('#tiki_sheet_container_fullscreen').remove(); - }); + }, function() { + $('#tiki_sheet_container') + .children($('#tiki_sheet_container_fullscreen').children()); + $('#tiki_sheet_container_fullscreen').remove(); + }); }); \ No newline at end of file Modified: branches/6.x/tiki-history_sheets.php =================================================================== --- branches/6.x/tiki-history_sheets.php 2010-10-15 22:24:34 UTC (rev 30062) +++ branches/6.x/tiki-history_sheets.php 2010-10-15 22:37:47 UTC (rev 30063) @@ -78,20 +78,21 @@ //$smarty->assign('paginate', $paginate); $smarty->assign( 'grid_content', diffSheetsAsHTML($_REQUEST["sheetId"], $dates) ); - $headerlib->add_jq_onready(' - if (typeof ajaxLoadingShow == "function") { - ajaxLoadingShow("role_main"); + $headerlib->add_jq_onready(" + if (typeof ajaxLoadingShow == 'function') { + ajaxLoadingShow('role_main'); } setTimeout (function () { - $("div.tiki_sheet").tiki("sheet", "",{ + $('div.tiki_sheet').tiki('sheet', '',{ editable: false, fnPaneScroll: $.sheet.paneScrollLocker, fnSwitchSheet: $.sheet.switchSheetLocker, height: 400 }); + setValuesForCompareSheet('$sheetIndexes[0]','$sheetIndexes[1]'); }, 500); - ', 500); + ", 500); if ( $tiki_sheet_div_style) { $smarty->assign('tiki_sheet_div_style', $tiki_sheet_div_style); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |