Project

General

Profile

Download (2.29 KB)

Bug #23304 » 15290_final_trunk.diff

Administrator Admin, 2010-09-20 16:11

View differences:

t3lib/class.t3lib_befunc.php (working copy)
*/
public static function viewOnClick($id, $backPath = '', $rootLine = '', $anchor = '', $altUrl = '', $addGetVars = '', $switchFocus = TRUE) {
$viewScriptPreviewEnabled = t3lib_extMgm::isLoaded('version') ?
$viewScriptPreviewDisabled = t3lib_extMgm::isLoaded('version') ?
'/' . TYPO3_mainDir . t3lib_extMgm::extRelPath('version') . 'ws/wsol_preview.php?id='
:
'/index.php?id='
;
$viewScriptPreviewDisabled = '/index.php?id=';
$viewScriptPreviewEnabled = '/index.php?id=';
if ($altUrl) {
$viewScriptPreviewEnabled = $viewScriptPreviewDisabled = $altUrl;
}
......
$urlPreviewEnabled = $viewDomain . $viewScriptPreviewEnabled . $id . $addGetVars . $anchor;
$urlPreviewDisabled = $viewDomain . $viewScriptPreviewDisabled . $id . $addGetVars . $anchor;
return "var previewWin=window.open(top.TYPO3.configuration.inWorkspace !== 0 && top.TYPO3.configuration.workspaceFrontendPreviewEnabled ?'" .
return "var previewWin=window.open((top.TYPO3.configuration.inWorkspace === 0 || (top.TYPO3.configuration.inWorkspace !== 0 && top.TYPO3.configuration.workspaceFrontendPreviewEnabled)) ?'" .
$urlPreviewEnabled . "':'" . $urlPreviewDisabled .
"','newTYPO3frontendWindow');" . ( $switchFocus ? 'previewWin.focus();' : '');
}
typo3/js/workspacemenu.js (working copy)
var switchRequest = new Ajax.Request('ajax.php', {
parameters: 'ajaxID=WorkspaceMenu::setWorkspace&workspaceId=' + workspaceId,
onSuccess: function(transport, response) {
TYPO3.configuration.inWorkspace = response.setWorkspaceId === 0 ? 0 : 1;
if (!response.setWorkspaceId) {
response.setWorkspaceId = 0;
}
top.TYPO3.configuration.inWorkspace = response.setWorkspaceId === 0 ? 0 : 1;
// first remove all checks, then set the check in front of the selected workspace
var stateActiveClass = 't3-icon t3-icon-status t3-icon-status-status t3-icon-status-checked';
(5-5/5)