Merge "resourceloader: Use AND instead of OR for upsert conds in saveFileDependencies()"

diff --git a/README b/README
index ad9b9d9..b9b2c8a 100644 (file)
--- a/README
+++ b/README
@@ -23,7 +23,7 @@ RELEASE-NOTES, INSTALL, and UPGRADE.
 * Seeking help from a person?
 ** https://www.mediawiki.org/wiki/Special:MyLanguage/Communication
 * Looking to file a bug report or a feature request?
-** https://bugs.mediawiki.org/
+** https://phabricator.mediawiki.org/
 * Interested in helping out?
 ** https://www.mediawiki.org/wiki/Special:MyLanguage/How_to_contribute
 

diff --git a/resources/src/jquery/jquery.suggestions.js b/resources/src/jquery/jquery.suggestions.js
index a585cf3..9e6ecc8 100644 (file)
--- a/resources/src/jquery/jquery.suggestions.js
+++ b/resources/src/jquery/jquery.suggestions.js
@@ -776,7 +776,10 @@
                                                }
                                                $.suggestions.hide( context );
                                                $.suggestions.cancel( context );
-                                       } );
+                                       } )
+                                       // Simulate a keypress on load. This loads the search suggestions when there are already
+                                       // typed characters before the JavaScript is loaded.
+                                       .trigger( 'keypress' );
                        }
 
                        // Store the context for next time