diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2018-05-23 22:01:17 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2018-05-23 22:01:17 +0100 |
| commit | 998f7ab12230321db5118a72cd8104e773440a4a (patch) | |
| tree | 2361b0838d3c9871d3be626299d74f56f4694848 /app | |
| parent | 69c24e964659daa98ff02929bd3c5f6d7bc2bbf2 (diff) | |
| download | webtrees-998f7ab12230321db5118a72cd8104e773440a4a.tar.gz webtrees-998f7ab12230321db5118a72cd8104e773440a4a.tar.bz2 webtrees-998f7ab12230321db5118a72cd8104e773440a4a.zip | |
Fix #1727 - on-screen-keyboard causes javascript error
Diffstat (limited to 'app')
| -rw-r--r-- | app/Functions/FunctionsEdit.php | 9 | ||||
| -rw-r--r-- | app/Functions/FunctionsPrint.php | 27 |
2 files changed, 1 insertions, 35 deletions
diff --git a/app/Functions/FunctionsEdit.php b/app/Functions/FunctionsEdit.php index 67db1360fd..69792d2ae8 100644 --- a/app/Functions/FunctionsEdit.php +++ b/app/Functions/FunctionsEdit.php @@ -846,7 +846,6 @@ class FunctionsEdit { if ($fact === 'TEXT' || $fact === 'ADDR' || ($fact === 'NOTE' && !$islink)) { $html .= '<div class="input-group">'; $html .= '<textarea class="form-control" id="' . $id . '" name="' . $name . '" dir="auto">' . e($value) . '</textarea>'; - $html .= self::inputAddonKeyboard($id); $html .= '</div>'; } else { // If using GEDFact-assistant window @@ -936,13 +935,7 @@ class FunctionsEdit { break; } - $html .= '<div id="' . $id . '_description">'; - - // pastable values - if ($fact === 'FORM' && $upperlevel === 'OBJE') { - FunctionsPrint::printAutoPasteLink($id, Config::fileFormats()); - } - $html .= '</div>' . $extra . '</div></div>'; + $html .= $extra . '</div></div>'; return $html; } diff --git a/app/Functions/FunctionsPrint.php b/app/Functions/FunctionsPrint.php index 93ebe55d5a..48dab0c3e2 100644 --- a/app/Functions/FunctionsPrint.php +++ b/app/Functions/FunctionsPrint.php @@ -618,33 +618,6 @@ class FunctionsPrint { } /** - * HTML link to open the special character window. - * - * @param string $element_id - * - * @return string - */ - public static function printSpecialCharacterLink($element_id) { - return FontAwesome::linkIcon('keyboard', I18N::translate('Find a special character'), ['href' => '#', 'onclick' => 'findSpecialChar(document.getElementById("' . $element_id . '")); if (window.updatewholename) { updatewholename(); } return false;']); - } - - /** - * HTML element to insert a value from a list. - * - * @param string $element_id - * @param string[] $choices - */ - public static function printAutoPasteLink($element_id, $choices) { - echo '<small>'; - foreach ($choices as $choice) { - echo '<span onclick="document.getElementById(\'', $element_id, '\').value='; - echo '\'', $choice, '\';'; - echo ' return false;">', $choice, '</span> '; - } - echo '</small>'; - } - - /** * Summary of LDS ordinances. * * @param Individual $individual |
