From b5d3efd430263a7dd11aa455ea590a5d348ead83 Mon Sep 17 00:00:00 2001 From: prageck Date: Sat, 20 Apr 2013 00:56:37 +0530 Subject: [PATCH] Fixed Bug 40464 Placeholder attribute of searchInput element Removed the javascript code that sets the placeholder of #searchInput element. Now the placeholder attribute of #searchInput element is set only in the original HTML. On browsers that do not support placeholder attribute, placeholder.js will insert the appropriate placeholder. Bug: 40464 Change-Id: I6496716f2bd25307004ba16bceadca4c6723a5db --- includes/SkinTemplate.php | 1 + resources/mediawiki/mediawiki.searchSuggest.js | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index 17ec88aead..a5709ead94 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -1804,6 +1804,7 @@ abstract class BaseTemplate extends QuickTemplate { $realAttrs = array( 'type' => 'search', 'name' => 'search', + 'placeholder' => wfMessage( 'searchsuggest-search' )->text(), 'value' => isset( $this->data['search'] ) ? $this->data['search'] : '', ); $realAttrs = array_merge( $realAttrs, Linker::tooltipAndAccesskeyAttribs( 'search' ), $attrs ); diff --git a/resources/mediawiki/mediawiki.searchSuggest.js b/resources/mediawiki/mediawiki.searchSuggest.js index 2bc7cea9eb..516c58f8be 100644 --- a/resources/mediawiki/mediawiki.searchSuggest.js +++ b/resources/mediawiki/mediawiki.searchSuggest.js @@ -196,11 +196,6 @@ return; } - // Placeholder text for search box - $searchInput - .attr( 'placeholder', mw.msg( 'searchsuggest-search' ) ) - .placeholder(); - // Special suggestions functionality for skin-provided search box $searchInput.suggestions( { result: { -- 2.20.1