danielsiepmann/feedit
danielsiepmann/feedit
1
0
mirror of https://github.com/FriendsOfTYPO3/feedit.git synced 2024-09-19 01:16:09 +02:00
Code Issues Releases Wiki Activity

[TASK] feedit: Bring back editNoPopup

Browse source 
* Restore edit_editNoPopup/forceNoPopup TSConfig options removed in #49640
* Initialize frontend editing when displayFieldEditIcons is set

Releases: master, 6.2
Resolves: #61095
Related: #43447
Related: #49640
Change-Id: I900a62b447a1a67265ce22cd73e150646344e090
Reviewed-on: http://review.typo3.org/32279
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
This commit is contained in:
Paul Golmann 2014-08-20 17:00:24 +02:00 committed by Markus Klein
parent 89a74a38f6
commit d67fa03411
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Classes/FrontendEditPanel.php
View file

@ -236,7 +236,8 @@ class FrontendEditPanel {
}
/**
* Creates a link to a script (eg. typo3/alt_doc.php or typo3/db_new.php) which either opens in the current frame OR in a pop-up window.
* Creates a link to a script (eg. typo3/alt_doc.php or typo3/db_new.php)
* which either opens in the current frame OR in a pop-up window.
*
* @param string $string The string to wrap in a link, typ. and image used as button in the edit panel.
* @param string $url The URL of the link. Should be absolute if supposed to work with <base> path set.
@ -244,8 +245,15 @@ class FrontendEditPanel {
* @see editPanelLinkWrap()
*/
protected function editPanelLinkWrap_doWrap($string, $url) {
$onclick = 'vHWin=window.open(' . GeneralUtility::quoteJSvalue($url . '&returnUrl=close.html') . ',\'FEquickEditWindow\',\'width=690,height=500,status=0,menubar=0,scrollbars=1,resizable=1\');vHWin.focus();return false;';
return '<a href="#" onclick="' . htmlspecialchars($onclick) . '" class="frontEndEditIconLinks">' . $string . '</a>';
// Open in the current frame?
if ($GLOBALS['BE_USER']->adminPanel->extGetFeAdminValue('edit', 'editNoPopup')) {
$href = htmlspecialchars($url . '&returnUrl=' . rawurlencode(GeneralUtility::getIndpEnv('REQUEST_URI')));
return '<a href="' . $href . '" class="frontEndEditIconLinks">' . $string . '</a>';
} else {
$onclick = 'vHWin=window.open(' . GeneralUtility::quoteJSvalue($url . '&returnUrl=close.html') .
',\'FEquickEditWindow\',\'width=690,height=500,status=0,menubar=0,scrollbars=1,resizable=1\');vHWin.focus();return false;';
return '<a href="#" onclick="' . htmlspecialchars($onclick) . '" class="frontEndEditIconLinks">' . $string . '</a>';
}
}
/**