https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114200
Revision: 114200 Author: awjrichards Date: 2012-03-19 22:16:13 +0000 (Mon, 19 Mar 2012) Log Message: ----------- r113463, r113465, r113466, r113469, r113470, r113471, r113472 Modified Paths: -------------- branches/wmf/1.19wmf1/extensions/MobileFrontend/javascripts/beta_opensearch.js branches/wmf/1.19wmf1/extensions/MobileFrontend/stylesheets/beta_common.css branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/ApplicationTemplate.php branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/SearchTemplate.php branches/wmf/1.19wmf1/extensions/MobileFrontend/tests/js/fixtures.js Property Changed: ---------------- branches/wmf/1.19wmf1/extensions/MobileFrontend/ Property changes on: branches/wmf/1.19wmf1/extensions/MobileFrontend ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/extensions/MobileFrontend:99727 + /trunk/extensions/MobileFrontend:99727,113463,113465-113466,113469-113472 Modified: branches/wmf/1.19wmf1/extensions/MobileFrontend/javascripts/beta_opensearch.js =================================================================== --- branches/wmf/1.19wmf1/extensions/MobileFrontend/javascripts/beta_opensearch.js 2012-03-19 22:10:05 UTC (rev 114199) +++ branches/wmf/1.19wmf1/extensions/MobileFrontend/javascripts/beta_opensearch.js 2012-03-19 22:16:13 UTC (rev 114200) @@ -3,18 +3,13 @@ MobileFrontend.opensearch = (function() { var apiUrl = '/api.php', timer = -1, typingDelay = 500, numResults = 15, term, - results = document.getElementById( 'results' ), search = document.getElementById( 'search' ), sq = document.getElementById( 'sq' ), sb = document.getElementById( 'searchbox' ), - logo = document.getElementById( 'logo' ), - goButton = document.getElementById( 'goButton' ), content = document.getElementById( 'content' ), footer = document.getElementById( 'footer' ), - zeroRatedBanner = document.getElementById( 'zero-rated-banner' ) || - document.getElementById( 'zero-rated-banner-red' ), clearSearch = document.getElementById( 'clearsearch' ), - focused = false, ol = {}, + focused = false, u = MobileFrontend.utils; if ( scriptPath ) { @@ -40,8 +35,7 @@ resetViewPort(); search.onfocus = function() { - var pE, pT, pTT, rrd, rrdD, - removeResultsEl; + var rrd, rrdD; sb = document.getElementById( 'searchbox' ); sq = document.getElementById( 'sq' ); content = document.getElementById( 'content' ); @@ -51,25 +45,8 @@ if ( !focused ) { MobileFrontend.utils( document.body ).addClass( 'full-screen-search' ); - pE = document.getElementById( 'placeholder' ); - if ( !pE ) { - pT = document.createElement( 'span' ); - pTT = document.createTextNode(placeholder); - pT.setAttribute( 'id', 'placeholder' ); - pT.appendChild(pTT); - sb.insertBefore( pT, sb.firstChild ); - } - pE = document.getElementById( 'placeholder' ); - if ( pE ) { - pE.style.display = 'block'; - } - - if ( pE && search.value !== '' ) { - pE.style.display = 'none'; - } - - removeResultsEl = document.getElementById( 'remove-results' ); - if ( !removeResultsEl ) { + rrd = document.getElementById( 'remove-results' ); + if ( !rrd ) { rrd = document.createElement( 'a' ); rrd.setAttribute( 'href', '#' ); rrd.setAttribute( 'id', 'remove-results' ); @@ -85,12 +62,7 @@ function removeResults() { MobileFrontend.utils( document.body ).removeClass( 'full-screen-search' ); - var removeResultsEl, pE = document.getElementById( 'placeholder' ); - if ( pE ) { - pE.style.display = 'none'; - } - if ( focused ) { focused = false; } @@ -182,8 +154,8 @@ } function htmlEntities( str ) { - var text = document.createTextNode( str ); - var el = document.createElement( 'div' ); + var text = document.createTextNode( str ), + el = document.createElement( 'div' ); el.appendChild( text ); return el.innerHTML; } @@ -202,12 +174,12 @@ search.focus(); } if ( !sections || sections.length < 1 ) { - results.innerHTML = "<div class=\"suggestions-results\" title=\"No Results\">No Results</div>"; + results.innerHTML = '<ul class="suggestions-results" title="No Results"><li class="suggestions-result">No Results</li></div>'; } else { if( results.firstChild ) { results.removeChild( results.firstChild ); } - suggestions = document.createElement( 'div' ); + suggestions = document.createElement( 'ul' ); suggestions.className = 'suggestions-results'; results.appendChild( suggestions ); suggestionListener = function() { @@ -217,7 +189,7 @@ for ( i = 0; i < sections.length; i++ ) { section = sections[i]; - suggestionsResult = document.createElement( 'div' ); + suggestionsResult = document.createElement( 'li' ); link = document.createElement( 'a' ); suggestionsResult.setAttribute( 'title', section.label ); suggestionsResult.className = 'suggestions-result'; @@ -244,17 +216,9 @@ } } - function handleDefaultText() { - var pE = document.getElementById( 'placeholder' ); - if ( pE ) { - pE.style.display = 'none'; - } - } - function initClearSearch() { var clearSearch = document.getElementById( 'clearsearch' ), - search = document.getElementById( 'search' ), - results = document.getElementById( 'results' ); + search = document.getElementById( 'search' ); function handleClearSearchLink() { if ( clearSearch ) { if ( search.value.length > 0 ) { @@ -278,7 +242,6 @@ } u( clearSearch ).bind( 'mousedown', clearSearchBox ); u( search ).bind( 'keyup', handleClearSearchLink ); - u( search ).bind( 'keydown', handleDefaultText ); u( search ).bind( 'click', onFocusHandler ); } @@ -288,7 +251,6 @@ document.body.onmousedown = whichElement; document.body.ontouchstart = whichElement; results.ontouchstart = whichElement; - search.onpaste = handleDefaultText; } init(); initClearSearch(); @@ -301,4 +263,4 @@ removeResults: removeResults }; -}()); \ No newline at end of file +}()); Modified: branches/wmf/1.19wmf1/extensions/MobileFrontend/stylesheets/beta_common.css =================================================================== --- branches/wmf/1.19wmf1/extensions/MobileFrontend/stylesheets/beta_common.css 2012-03-19 22:10:05 UTC (rev 114199) +++ branches/wmf/1.19wmf1/extensions/MobileFrontend/stylesheets/beta_common.css 2012-03-19 22:16:13 UTC (rev 114200) @@ -1,8 +1,8 @@ html, -body { - margin: 0; - padding: 0; - height: 100%; +body { + margin: 0; + padding: 0; + height: 100%; } html { @@ -106,38 +106,16 @@ text-align: center; } -.suggestions-results { - font-size: 1.4em; - cursor: pointer; - margin: 0; - padding: 0; -} - -.suggestions-results hr { - margin: 0; -} - -.suggestions-result { - color: black; - margin: 0; - line-height: 2.6em; - padding: 0.01em 0.25em; - postion: relative; - border-bottom: solid 1px #999999; -} - .suggestions-result a { text-decoration: none; color: #666; } -.suggestions-result a:link { - text-decoration: none; - color:#666; -} + .suggestions-result a:visited { text-decoration: none; color:#666; } + .suggestions-result a:hover { text-decoration: none; color:#666; @@ -146,9 +124,11 @@ text-decoration: none; color:#666; } + .suggestions-result:hover { background-color: #ACD1E9; } + a.sq-val-update { font-size: 1.3em; display: block; @@ -160,15 +140,15 @@ width: 1.5em; text-align: center; } -a.sq-val-update:link { - text-decoration: none; -} + a.sq-val-update:visited { text-decoration: none; } + a.sq-val-update:hover { text-decoration: none; } + a.sq-val-update:active { text-decoration: none; } @@ -785,11 +765,19 @@ position: relative; border-bottom: solid 1px #999; font-size: 1.4em; + cursor: pointer; + margin: 0; } .full-screen-search .suggestions-result { line-height: 2.6em; border: none; + color: black; + margin: 0; + line-height: 2.6em; + padding: 0.01em 0.25em; + position: relative; + border-bottom: solid 1px #999999; } .full-screen-search .suggestions-result a:visited { @@ -841,13 +829,3 @@ .full-screen-search #nav { display: none !important; } - -#placeholder { - position: absolute; - left: 38px; - z-index: 2; - top: 0; - color: #666; - font-size: 16px; - padding-top: 10px; -} Modified: branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/ApplicationTemplate.php =================================================================== --- branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/ApplicationTemplate.php 2012-03-19 22:10:05 UTC (rev 114199) +++ branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/ApplicationTemplate.php 2012-03-19 22:16:13 UTC (rev 114200) @@ -54,14 +54,13 @@ <link href='{$this->data['wgExtensionAssetsPath']}/MobileFrontend/stylesheets/{$betaPrefix}common.css?version=1331257310' media='all' rel='Stylesheet' type='text/css' /> <link href='{$this->data['wgExtensionAssetsPath']}/MobileFrontend/stylesheets/{$cssFileName}.css?version=1331257310' media='all' rel='Stylesheet' type='text/css' /> {$filePageStyle} - <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <meta name="viewport" content="max-width=device-width, initial-scale=1.0"> {$appleTouchIconTag} {$jQueryScript} <script type='text/javascript'> //<![CDATA[ var title = "{$this->data['htmlTitle']}"; var scriptPath = "{$this->data['wgScriptPath']}"; - var placeholder = "{$this->data['placeholder']}"; var showText = "{$buttonShowText}"; var hideText = "{$buttonHideText}"; //]]> Modified: branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/SearchTemplate.php =================================================================== --- branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/SearchTemplate.php 2012-03-19 22:10:05 UTC (rev 114199) +++ branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/SearchTemplate.php 2012-03-19 22:16:13 UTC (rev 114200) @@ -14,6 +14,8 @@ $homeButton = $this->data['messages']['mobile-frontend-home-button']; $randomButton = $this->data['messages']['mobile-frontend-random-button']; $clearText = htmlentities( $this->data['messages']['mobile-frontend-clear-search'], ENT_QUOTES ); + $searchValue = $this->data['messages']['mobile-frontend-search-submit']; + $placeholder = htmlentities( $this->data['messages']['mobile-frontend-placeholder'], ENT_QUOTES ); $scriptUrl = wfScript(); $searchBoxDisplayNone = ( $this->data['hideSearchBox'] ) ? ' style="display: none;" ' : ''; @@ -34,7 +36,7 @@ <form action='{$scriptUrl}' class='search_bar' method='get' {$searchBoxDisplayNone}> <input type="hidden" value="Special:Search" name="title" /> <div id="sq" class="divclearable"> - <input type="search" name="search" id="search" size="22" value="{$searchField}" autocorrect="off" autocomplete="off" autocapitalize="off" maxlength="1024" class="search" /> + <input type="search" name="search" id="search" size="22" value="{$searchField}" autocorrect="off" autocomplete="off" autocapitalize="off" maxlength="1024" class="search" placeholder="{$placeholder}" /> <div class="clearlink" id="clearsearch" title="{$clearText}"></div> </div> <button id='goButton' class='goButton' type='submit'></button> Modified: branches/wmf/1.19wmf1/extensions/MobileFrontend/tests/js/fixtures.js =================================================================== --- branches/wmf/1.19wmf1/extensions/MobileFrontend/tests/js/fixtures.js 2012-03-19 22:10:05 UTC (rev 114199) +++ branches/wmf/1.19wmf1/extensions/MobileFrontend/tests/js/fixtures.js 2012-03-19 22:16:13 UTC (rev 114200) @@ -1,3 +1,5 @@ +var showText = "show", hideText = "hide"; + window.MobileFrontendTests = { cleanFixtures: function() { // note the ZeroRatedMobileAccess extension attaches a banner to the qunit test suite _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs