https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114943
Revision: 114943
Author: awjrichards
Date: 2012-04-17 19:07:05 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
MFG Change-Id: Iba41db4e90333a01ffc9dc52a3d3de0c460cbfd9
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/MobileFrontend/javascripts/beta_opensearch.js
branches/wmf/1.19wmf1/extensions/MobileFrontend/javascripts/beta_opensearch.min.js
branches/wmf/1.19wmf1/extensions/MobileFrontend/stylesheets/firefox.css
branches/wmf/1.19wmf1/extensions/MobileFrontend/stylesheets/hacks.css
Modified:
branches/wmf/1.19wmf1/extensions/MobileFrontend/javascripts/beta_opensearch.js
===================================================================
---
branches/wmf/1.19wmf1/extensions/MobileFrontend/javascripts/beta_opensearch.js
2012-04-17 18:58:10 UTC (rev 114942)
+++
branches/wmf/1.19wmf1/extensions/MobileFrontend/javascripts/beta_opensearch.js
2012-04-17 19:07:05 UTC (rev 114943)
@@ -73,13 +73,7 @@
var el, newEv,
topResult = u( '.suggestions-result a' )[0];
if( topResult ) {
- if ( 'fireEvent' in topResult ) {
- topResult.fireEvent( 'click' );
- } else {
- newEv = document.createEvent( 'HTMLEvents' );
- newEv.initEvent( 'click', true, true );
- topResult.dispatchEvent( newEv );
- }
+ window.location.href = topResult.getAttribute( 'href' );
ev.preventDefault();
} else {
performSearch( ev );
Modified:
branches/wmf/1.19wmf1/extensions/MobileFrontend/javascripts/beta_opensearch.min.js
===================================================================
---
branches/wmf/1.19wmf1/extensions/MobileFrontend/javascripts/beta_opensearch.min.js
2012-04-17 18:58:10 UTC (rev 114942)
+++
branches/wmf/1.19wmf1/extensions/MobileFrontend/javascripts/beta_opensearch.min.js
2012-04-17 19:07:05 UTC (rev 114943)
@@ -1 +1 @@
-MobileFrontend.opensearch=(function(){var
b="/api.php",k=-1,c=500,x=15,p,i=document.getElementById("search"),a=document.getElementById("searchbox"),q=document.getElementById("content"),n=document.getElementById("footer"),w=MobileFrontend.setting("scriptPath")+"/extensions/MobileFrontend/stylesheets/images/blank.gif",t=document.getElementById("clearsearch"),h=false,l=MobileFrontend.utils;b=MobileFrontend.setting("scriptPath")+b;function
y(){var
u;a=document.getElementById("searchbox");header=document.getElementById("header");q=document.getElementById("content");n=document.getElementById("footer");if(!h){MobileFrontend.utils(document.body).addClass("full-screen-search");u=document.getElementById("remove-results");if(!u){u=document.createElement("img");u.setAttribute("id","remove-results");l(u).bind("click",v);u.setAttribute("src",w);u.setAttribute("alt",MobileFrontend.message("remove-results"));header.insertBefore(u,header.firstChild)}h=true}}l(i).bind("focus",y);function
v(){MobileFrontend.utils(document.body).removeClass("full-screen-search");if(h){h=false}}var
j=function(u){if(u){u.preventDefault()}clearTimeout(k);p=i.value;if(p.length>1){p=encodeURIComponent(p);k=setTimeout(function(){g(p)},c)}};var
m;window.setInterval(function(){var
u=i.value;if(u.length>1&&u!==m){m=u;l(a).addClass("notEmpty");j()}else{if(!u){l(a).removeClass("notEmpty")}}},c);l(document.getElementById("searchForm")).bind("submit",function(B){var
u,C,A=l(".suggestions-result a")[0];if(A){if("fireEvent" in
A){A.fireEvent("click")}else{C=document.createEvent("HTMLEvents");C.initEvent("click",true,true);A.dispatchEvent(C)}B.preventDefault()}else{j(B)}});function
z(u){if(i.value.length===0){v()}else{j(u)}}l(i).bind("blur",z);function
g(u){l(i).addClass("searching");url=b+"?action=opensearch&limit="+x+"&namespace=0&format=xml&search="+u;l.ajax({url:url,success:function(A){if(l(document.body).hasClass("full-screen-search")){o(f(A));l(i).removeClass("searching")}}})}function
f(D){var
E=[],A,B,C,u=D.getElementsByTagName("Item");for(A=0;A<u.length;A++){B=u[A];C={label:B.getElementsByTagName("Text")[0].textContent,value:B.getElementsByTagName("Url")[0].textContent};E.push(C)}return
E}function d(B){var
A=document.createTextNode(B),u=document.createElement("div");u.appendChild(A);return
u.innerHTML}function s(u){return
u.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")}function o(I){var
C=document.getElementById("results"),E,D,B=d(document.getElementById("search").value),H,A,u,F,G;if(!I||I.length<1){C.innerHTML='<ul
class="suggestions-results" title="No Results"><li
class="suggestions-result">No
Results</li></div>'}else{if(C.firstChild){C.removeChild(C.firstChild)}E=document.createElement("ul");E.className="suggestions-results";C.appendChild(E);for(D=0;D<I.length;D++){H=I[D];u=document.createElement("li");u.setAttribute("title",H.label);u.className="suggestions-result";F=document.createElement("a");F.setAttribute("href",H.value.replace(/^(?:\/\/|[^\/]+)*\//,"/"));F.className="search-result-item";G=document.createTextNode(H.label);F.appendChild(G);u.appendChild(F);E.appendChild(u);A=s(B);F.innerHTML=F.innerHTML.replace(new
RegExp("("+A+")","ig"),"<strong>$1</strong>")}}}function e(){var
D=document.getElementById("clearsearch"),A=document.getElementById("results"),u=document.getElementById("search");function
B(E){window.setTimeout(function(){u.value=""},100);A.innerHTML="";E.preventDefault()}function
C(){u.select()}l(D).bind("mousedown",B);l(u).bind("click",C)}function
r(){if(document.activeElement&&document.activeElement.id==="search"){y()}}r();e();return{init:r,initClearSearch:e,writeResults:o,createObjectArray:f,removeResults:v}}());
\ No newline at end of file
+MobileFrontend.opensearch=(function(){var
b="/api.php",k=-1,c=500,x=15,p,i=document.getElementById("search"),a=document.getElementById("searchbox"),q=document.getElementById("content"),n=document.getElementById("footer"),w=MobileFrontend.setting("scriptPath")+"/extensions/MobileFrontend/stylesheets/images/blank.gif",t=document.getElementById("clearsearch"),h=false,l=MobileFrontend.utils;b=MobileFrontend.setting("scriptPath")+b;function
y(){var
u;a=document.getElementById("searchbox");header=document.getElementById("header");q=document.getElementById("content");n=document.getElementById("footer");if(!h){MobileFrontend.utils(document.body).addClass("full-screen-search");u=document.getElementById("remove-results");if(!u){u=document.createElement("img");u.setAttribute("id","remove-results");l(u).bind("click",v);u.setAttribute("src",w);u.setAttribute("alt",MobileFrontend.message("remove-results"));header.insertBefore(u,header.firstChild)}h=true}}l(i).bind("focus",y);function
v(){MobileFrontend.utils(document.body).removeClass("full-screen-search");if(h){h=false}}var
j=function(u){if(u){u.preventDefault()}clearTimeout(k);p=i.value;if(p.length>1){p=encodeURIComponent(p);k=setTimeout(function(){g(p)},c)}};var
m;window.setInterval(function(){var
u=i.value;if(u.length>1&&u!==m){m=u;l(a).addClass("notEmpty");j()}else{if(!u){l(a).removeClass("notEmpty")}}},c);l(document.getElementById("searchForm")).bind("submit",function(B){var
u,C,A=l(".suggestions-result
a")[0];if(A){window.location.href=A.getAttribute("href");B.preventDefault()}else{j(B)}});function
z(u){if(i.value.length===0){v()}else{j(u)}}l(i).bind("blur",z);function
g(u){l(i).addClass("searching");url=b+"?action=opensearch&limit="+x+"&namespace=0&format=xml&search="+u;l.ajax({url:url,success:function(A){if(l(document.body).hasClass("full-screen-search")){o(f(A));l(i).removeClass("searching")}}})}function
f(D){var
E=[],A,B,C,u=D.getElementsByTagName("Item");for(A=0;A<u.length;A++){B=u[A];C={label:B.getElementsByTagName("Text")[0].textContent,value:B.getElementsByTagName("Url")[0].textContent};E.push(C)}return
E}function d(B){var
A=document.createTextNode(B),u=document.createElement("div");u.appendChild(A);return
u.innerHTML}function s(u){return
u.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")}function o(I){var
C=document.getElementById("results"),E,D,B=d(document.getElementById("search").value),H,A,u,F,G;if(!I||I.length<1){C.innerHTML='<ul
class="suggestions-results" title="No Results"><li
class="suggestions-result">No
Results</li></div>'}else{if(C.firstChild){C.removeChild(C.firstChild)}E=document.createElement("ul");E.className="suggestions-results";C.appendChild(E);for(D=0;D<I.length;D++){H=I[D];u=document.createElement("li");u.setAttribute("title",H.label);u.className="suggestions-result";F=document.createElement("a");F.setAttribute("href",H.value.replace(/^(?:\/\/|[^\/]+)*\//,"/"));F.className="search-result-item";G=document.createTextNode(H.label);F.appendChild(G);u.appendChild(F);E.appendChild(u);A=s(B);F.innerHTML=F.innerHTML.replace(new
RegExp("("+A+")","ig"),"<strong>$1</strong>")}}}function e(){var
D=document.getElementById("clearsearch"),A=document.getElementById("results"),u=document.getElementById("search");function
B(E){window.setTimeout(function(){u.value=""},100);A.innerHTML="";E.preventDefault()}function
C(){u.select()}l(D).bind("mousedown",B);l(u).bind("click",C)}function
r(){if(document.activeElement&&document.activeElement.id==="search"){y()}}r();e();return{init:r,initClearSearch:e,writeResults:o,createObjectArray:f,removeResults:v}}());
\ No newline at end of file
Modified:
branches/wmf/1.19wmf1/extensions/MobileFrontend/stylesheets/firefox.css
===================================================================
--- branches/wmf/1.19wmf1/extensions/MobileFrontend/stylesheets/firefox.css
2012-04-17 18:58:10 UTC (rev 114942)
+++ branches/wmf/1.19wmf1/extensions/MobileFrontend/stylesheets/firefox.css
2012-04-17 19:07:05 UTC (rev 114943)
@@ -9,4 +9,10 @@
margin-top: 8px;
}
-
+/* avoid float issues in fennec caused by MediaWiki:Common.css definition */
+div.tright,
+div.floatright,
+table.floatright {
+ clear: none !important;
+ float: none !important;
+}
Modified: branches/wmf/1.19wmf1/extensions/MobileFrontend/stylesheets/hacks.css
===================================================================
--- branches/wmf/1.19wmf1/extensions/MobileFrontend/stylesheets/hacks.css
2012-04-17 18:58:10 UTC (rev 114942)
+++ branches/wmf/1.19wmf1/extensions/MobileFrontend/stylesheets/hacks.css
2012-04-17 19:07:05 UTC (rev 114943)
@@ -82,11 +82,3 @@
text-align: center;
width: auto !important;
}
-
-/* avoid float issues in fennec caused by MediaWiki:Common.css definiton */
-div.tright,
-div.floatright,
-table.floatright {
- clear: none !important;
- float: none !important;
-}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
