Commit cfeef4c8 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

revert r.26675 (at least with Firefox 3, onkeypress seems to send form too...

revert r.26675 (at least with Firefox 3, onkeypress seems to send form too early if we choose something from field's history and then hit enter key), because such a workaround is just a hack and it prevents selenium functional test working.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26875 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a242dbf1
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<fieldset id="fieldset-tiosearch">\n <fieldset id="fieldset-tiosearch">\n
<input type="hidden" name="all_languages" value="1" />\n <input type="hidden" name="all_languages" value="1" />\n
<input accesskey="4" type="text" size="40" name="field_your_search_text" class="input-text" \n <input accesskey="4" type="text" size="40" name="field_your_search_text" class="input-text" \n
onkeyup="submitFormOnEnter(event, this.form, \'ERP5Site_viewQuickSearchResultList\');" />\n onkeypress="submitFormOnEnter(event, this.form, \'ERP5Site_viewQuickSearchResultList\');" />\n
<input type="submit" class="input-submit" value="" alt="Search"\n <input type="submit" class="input-submit" value="" alt="Search"\n
name="ERP5Site_viewQuickSearchResultList:method"/> \n name="ERP5Site_viewQuickSearchResultList:method"/> \n
</fieldset>\n </fieldset>\n
......
37 38
\ No newline at end of file \ No newline at end of file
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
tal:define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \n tal:define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \n
\'text/html;; charset=utf-8\');">\n \'text/html;; charset=utf-8\');">\n
<div>\n <div>\n
<input type="text" onkeyup="submitFormOnEnter(event, this.form, \'ERP5Site_processAdvancedSearch\');" class="input-text" name="top_your_search_text" size="40" accesskey="4"/>\n <input type="text" onkeypress="submitFormOnEnter(event, this.form, \'ERP5Site_processAdvancedSearch\');" class="input-text" name="top_your_search_text" size="40" accesskey="4"/>\n
<select size="1" class="input" name="top_your_search_portal_type">\n <select size="1" class="input" name="top_your_search_portal_type">\n
<option value="" selected="selected" i18n:translate="" i18n:domain="ui">Everything</option>\n <option value="" selected="selected" i18n:translate="" i18n:domain="ui">Everything</option>\n
<option value="all" i18n:translate="" i18n:domain="ui">All Documents</option>\n <option value="all" i18n:translate="" i18n:domain="ui">All Documents</option>\n
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<div class="centeredInner searchBar" \n <div class="centeredInner searchBar" \n
tal:condition="python:not is_gadget_mode and show_search_line">\n tal:condition="python:not is_gadget_mode and show_search_line">\n
<input name="top_your_search_text" size="40" value="" type="text"\n <input name="top_your_search_text" size="40" value="" type="text"\n
onkeyup="submitFormOnEnter(event, this.form, \'ERP5Site_processAdvancedSearch\');"\n onkeypress="submitFormOnEnter(event, this.form, \'ERP5Site_processAdvancedSearch\');"\n
tal:attributes="value your_search_text" />\n tal:attributes="value your_search_text" />\n
<input class="button" i18n:domain="ui" i18n:attributes="value"\n <input class="button" i18n:domain="ui" i18n:attributes="value"\n
value="Search" name="ERP5Site_processAdvancedSearch:method" type="submit" />\n value="Search" name="ERP5Site_processAdvancedSearch:method" type="submit" />\n
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
<!-- Advanced Search footer -->\n <!-- Advanced Search footer -->\n
<div class="centeredInner extendedSearchBar" tal:condition="python: not is_gadget_mode and show_search_line">\n <div class="centeredInner extendedSearchBar" tal:condition="python: not is_gadget_mode and show_search_line">\n
<input name="bottom_your_search_text" size="40" value="" type="text"\n <input name="bottom_your_search_text" size="40" value="" type="text"\n
onkeyup="submitFormOnEnter(event, this.form, \'ERP5Site_processAdvancedSearchBottom\');"\n onkeypress="submitFormOnEnter(event, this.form, \'ERP5Site_processAdvancedSearchBottom\');"\n
tal:attributes="value your_search_text" />\n tal:attributes="value your_search_text" />\n
<input class="button" i18n:domain="ui" i18n:attributes="value"\n <input class="button" i18n:domain="ui" i18n:attributes="value"\n
value="Search" name="ERP5Site_processAdvancedSearchBottom:method" type="submit" />\n value="Search" name="ERP5Site_processAdvancedSearchBottom:method" type="submit" />\n
......
...@@ -325,7 +325,7 @@ ...@@ -325,7 +325,7 @@
tal:condition="python:not is_gadget_mode and show_search_line and your_search_text is not None">\n tal:condition="python:not is_gadget_mode and show_search_line and your_search_text is not None">\n
<input name="bottom_your_search_text" size="40" value=""\n <input name="bottom_your_search_text" size="40" value=""\n
type="text" tal:attributes="value your_search_text"\n type="text" tal:attributes="value your_search_text"\n
onkeyup="submitFormOnEnter(event, this.form, \'ERP5Site_processAdvancedSearchBottom\');"/>\n onkeypress="submitFormOnEnter(event, this.form, \'ERP5Site_processAdvancedSearchBottom\');"/>\n
<input class="button" value="Search" name="ERP5Site_processAdvancedSearchBottom:method" type="submit" />\n <input class="button" value="Search" name="ERP5Site_processAdvancedSearchBottom:method" type="submit" />\n
</div>\n </div>\n
\n \n
......
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
<span id="search">\n <span id="search">\n
<input type="hidden" name="all_languages" value="1" />\n <input type="hidden" name="all_languages" value="1" />\n
<input accesskey="4" type="text" name="field_your_search_text" \n <input accesskey="4" type="text" name="field_your_search_text" \n
onkeyup="submitFormOnEnter(event, this.form, \'ERP5Site_viewQuickSearchResultList\');" />\n onkeypress="submitFormOnEnter(event, this.form, \'ERP5Site_viewQuickSearchResultList\');" />\n
<button type="submit" name="ERP5Site_viewQuickSearchResultList:method" title="Search"\n <button type="submit" name="ERP5Site_viewQuickSearchResultList:method" title="Search"\n
i18n:attributes="title" i18n:domain="ui">\n i18n:attributes="title" i18n:domain="ui">\n
<span class="image"></span>\n <span class="image"></span>\n
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
name string:${field_id}_page_start;\n name string:${field_id}_page_start;\n
value python:here.current_page + 1;\n value python:here.current_page + 1;\n
size python:len(str(here.total_pages));\n size python:len(str(here.total_pages));\n
onkeyup string:submitFormOnEnter(event, this.form, \'${field_id}_setPage\')" />\n onkeypress string:submitFormOnEnter(event, this.form, \'${field_id}_setPage\')" />\n
/ \n / \n
<tal:block content="here/total_pages" />\n <tal:block content="here/total_pages" />\n
<tal:block tal:condition="python: here.current_page < here.total_pages - 1">\n <tal:block tal:condition="python: here.current_page < here.total_pages - 1">\n
......
749 750
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment