TheDJ has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/103066


Change subject: Alternative idea to change: 
I5fe0543e273aab4fbfb88f8ce933bc49872d4793
......................................................................

Alternative idea to change:
I5fe0543e273aab4fbfb88f8ce933bc49872d4793

Change-Id: I270aacd12cd682c833c8e92026fc212668926a44
---
M resources/mediawiki/mediawiki.searchSuggest.js
M skins/Vector.php
M skins/common/commonInterface.css
3 files changed, 12 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/66/103066/1

diff --git a/resources/mediawiki/mediawiki.searchSuggest.js 
b/resources/mediawiki/mediawiki.searchSuggest.js
index 7f07862..77b8e9f 100644
--- a/resources/mediawiki/mediawiki.searchSuggest.js
+++ b/resources/mediawiki/mediawiki.searchSuggest.js
@@ -40,6 +40,7 @@
                if ( !$.client.test( map ) ) {
                        return;
                }
+               $( '.searchButton' ).toggleClass('hidden visible');
 
                // Compute form data for search suggestions functionality.
                function computeResultRenderCache( context ) {
diff --git a/skins/Vector.php b/skins/Vector.php
index 17f1be0..7bab2cf 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -437,11 +437,11 @@
                        echo $this->makeSearchInput( array( 'id' => 
'searchInput' ) );
                        echo Html::hidden( 'title', $this->get( 'searchtitle' ) 
);
                        // Browsers will use this fulltext search button by 
default if their JavaScript support is turned off
-                       echo Html::rawElement( 'noscript', array(),
-                               $this->makeSearchButton( 'fulltext', array( 
'id' => 'mw-searchButton', 'class' => 'searchButton' ) )
-                       );
+                       //echo Html::rawElement( 'noscript', array(),
+                               echo $this->makeSearchButton( 'fulltext', 
array( 'id' => 'mw-searchButton', 'class' => 'searchButton visible' ) );
+                       //);
                        // Otherwise only this direct search button will be 
visible and actionable
-                       echo $this->makeSearchButton( 'go', array( 'id' => 
'searchButton', 'class' => 'searchButton' ) );
+                       echo $this->makeSearchButton( 'go', array( 'id' => 
'searchButton', 'class' => 'searchButton hidden' ) );
                        ?>
                </div>
        </form>
diff --git a/skins/common/commonInterface.css b/skins/common/commonInterface.css
index af6665e..ae36d90 100644
--- a/skins/common/commonInterface.css
+++ b/skins/common/commonInterface.css
@@ -66,3 +66,10 @@
        display: block;
 }
 
+.searchButton.hidden {
+       display: none;
+}
+.searchButton.visible {
+       display: block;
+}
+

-- 
To view, visit https://gerrit.wikimedia.org/r/103066
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I270aacd12cd682c833c8e92026fc212668926a44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ <hartman.w...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to