http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97680
Revision: 97680
Author: reedy
Date: 2011-09-20 23:14:03 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
1.18wmf1 Merge r97533, r97556, r97563, r97592, r97654
Modified Paths:
--------------
branches/wmf/1.18wmf1/extensions/MobileFrontend/DeviceDetection.php
branches/wmf/1.18wmf1/extensions/MobileFrontend/javascripts/application.js
branches/wmf/1.18wmf1/extensions/MobileFrontend/views/layout/application.html.php
Property Changed:
----------------
branches/wmf/1.18wmf1/extensions/MobileFrontend/
branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php
Property changes on: branches/wmf/1.18wmf1/extensions/MobileFrontend
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/MobileFrontend:51646
/branches/new-installer/phase3/extensions/MobileFrontend:43664-66004
/branches/sqlite/extensions/MobileFrontend:58211-58321
/branches/wmf/1.16wmf4/extensions/MobileFrontend:67177,69199,76243,77266
/branches/wmf-deployment/extensions/MobileFrontend:60970
/trunk/extensions/MobileFrontend:93435-93733
/trunk/phase3/extensions/MobileFrontend:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80406,81833,83212,83590
+ /branches/REL1_15/phase3/extensions/MobileFrontend:51646
/branches/new-installer/phase3/extensions/MobileFrontend:43664-66004
/branches/sqlite/extensions/MobileFrontend:58211-58321
/branches/wmf/1.16wmf4/extensions/MobileFrontend:67177,69199,76243,77266
/branches/wmf/1.17wmf1/extensions/MobileFrontend:97563,97592
/branches/wmf-deployment/extensions/MobileFrontend:60970
/trunk/extensions/MobileFrontend:93435-93733,97556
/trunk/phase3/extensions/MobileFrontend:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80406,81833,83212,83590
Modified: branches/wmf/1.18wmf1/extensions/MobileFrontend/DeviceDetection.php
===================================================================
--- branches/wmf/1.18wmf1/extensions/MobileFrontend/DeviceDetection.php
2011-09-20 23:03:21 UTC (rev 97679)
+++ branches/wmf/1.18wmf1/extensions/MobileFrontend/DeviceDetection.php
2011-09-20 23:14:03 UTC (rev 97680)
@@ -154,7 +154,7 @@
'footmenu' => 'default',
'with_layout' => 'application',
'css_file_name' => 'blackberry',
- 'supports_javascript' => true,
+ 'supports_javascript' => false,
'disable_zoom' => true,
'parser' => 'html',
'disable_links' => true,
Property changes on:
branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/MobileFrontend/MobileFrontend.php:51646
/branches/new-installer/phase3/extensions/MobileFrontend/MobileFrontend.php:43664-66004
/branches/sqlite/extensions/MobileFrontend/MobileFrontend.php:58211-58321
/branches/wmf/1.16wmf4/extensions/MobileFrontend/MobileFrontend.php:67177,69199,76243,77266
/branches/wmf-deployment/extensions/MobileFrontend/MobileFrontend.php:60970
/trunk/extensions/MobileFrontend/MobileFrontend.php:93435-93734,95387
/trunk/phase3/extensions/MobileFrontend/MobileFrontend.php:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80406,81833,83212,83590
+ /branches/REL1_15/phase3/extensions/MobileFrontend/MobileFrontend.php:51646
/branches/new-installer/phase3/extensions/MobileFrontend/MobileFrontend.php:43664-66004
/branches/sqlite/extensions/MobileFrontend/MobileFrontend.php:58211-58321
/branches/wmf/1.16wmf4/extensions/MobileFrontend/MobileFrontend.php:67177,69199,76243,77266
/branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php:97563,97592
/branches/wmf-deployment/extensions/MobileFrontend/MobileFrontend.php:60970
/trunk/extensions/MobileFrontend/MobileFrontend.php:93435-93734,95387,97556
/trunk/phase3/extensions/MobileFrontend/MobileFrontend.php:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80406,81833,83212,83590
Modified:
branches/wmf/1.18wmf1/extensions/MobileFrontend/javascripts/application.js
===================================================================
--- branches/wmf/1.18wmf1/extensions/MobileFrontend/javascripts/application.js
2011-09-20 23:03:21 UTC (rev 97679)
+++ branches/wmf/1.18wmf1/extensions/MobileFrontend/javascripts/application.js
2011-09-20 23:14:03 UTC (rev 97680)
@@ -1,49 +1,45 @@
-// Ideally, this would be loaded in the head and activated by a script at the
bottom,
-// I think, rather than attached to an onload...
-window.onload = function() {
- // I don't think this makes sense. Loading this here means that this
button
- // won't function until the page is loaded. It would probably be an
- // improvement to just attach an onclick straight into the html.
- document.getElementById( 'logo' ).onclick = function() {
- var n = document.getElementById( 'nav' ).style;
- n.display = n.display == 'block' ? 'none' : 'block';
- };
+// I don't think this makes sense. Loading this here means that this button
+// won't function until the page is loaded. It would probably be an
+// improvement to just attach an onclick straight into the html.
+document.getElementById( 'logo' ).onclick = function() {
+ var n = document.getElementById( 'nav' ).style;
+ n.display = n.display == 'block' ? 'none' : 'block';
+};
- // Also problematic, not working until the page loads...
- for( var h = document.getElementsByTagName( 'h2' ), i = 0; i <
h.length; i++ ) {
- if ( h[i].className == 'section_heading' ) {
- h[i].onclick = function() {
- var section_idx = parseInt( this.id.replace(
/section_(\d+)/, '$1' ) );
- wm_toggle_section( section_idx );
- }
+// Also problematic, not working until the page loads...
+for( var h = document.getElementsByTagName( 'h2' ), i = 0; i < h.length; i++ )
{
+ if ( h[i].className == 'section_heading' ) {
+ h[i].onclick = function() {
+ var section_idx = parseInt( this.id.replace(
/section_(\d+)/, '$1' ) );
+ wm_toggle_section( section_idx );
}
- };
+ }
+};
- // And this...
- for ( var a = document.getElementsByTagName( 'a' ), i = 0; i <
a.length; i++ ) {
- a[i].onclick = function() {
- if ( this.hash.indexOf( '#' ) == 0 ) {
- wm_reveal_for_hash( this.hash );
- }
+// And this...
+for ( var a = document.getElementsByTagName( 'a' ), i = 0; i < a.length; i++ )
{
+ a[i].onclick = function() {
+ if ( this.hash.indexOf( '#' ) == 0 ) {
+ wm_reveal_for_hash( this.hash );
}
- };
-
- if ( document.location.hash.indexOf( '#' ) == 0 ) {
- wm_reveal_for_hash( document.location.hash );
}
+};
- updateOrientation();
+if ( document.location.hash.indexOf( '#' ) == 0 ) {
+ wm_reveal_for_hash( document.location.hash );
+}
- // Try to scroll and hide URL bar
- window.scrollTo( 0, 1 );
+updateOrientation();
- // This is a global. I don't know why.
- decode = document.getElementById( 'searchField' );
- decode.value = unescape( decode.value );
- decode = document.getElementsByTagName( 'title' )[0];
- decode.innerHTML = unescape( decode.innerHTML );
-};
+// Try to scroll and hide URL bar
+window.scrollTo( 0, 1 );
+// This is a global. I don't know why.
+decode = document.getElementById( 'searchField' );
+decode.value = unescape( decode.value );
+decode = document.getElementsByTagName( 'title' )[0];
+decode.innerHTML = unescape( decode.innerHTML );
+
/**
* updateOrientation checks the current orientation, sets the body's class
* attribute to portrait, landscapeLeft, or landscapeRight,
@@ -87,4 +83,4 @@
var s = document.getElementById( d[i] + section_id ).style;
s.display = s.display == 'block' ? 'none' : 'block';
}
-}
\ No newline at end of file
+}
Modified:
branches/wmf/1.18wmf1/extensions/MobileFrontend/views/layout/application.html.php
===================================================================
---
branches/wmf/1.18wmf1/extensions/MobileFrontend/views/layout/application.html.php
2011-09-20 23:03:21 UTC (rev 97679)
+++
branches/wmf/1.18wmf1/extensions/MobileFrontend/views/layout/application.html.php
2011-09-20 23:14:03 UTC (rev 97680)
@@ -34,7 +34,6 @@
}
//]]>
</script>
- <script type="text/javascript" language="javascript"
src="{$wgExtensionAssetsPath}/MobileFrontend/javascripts/application.js?version=20110912T172820Z"></script>
</head>
<body>
{$searchWebkitHtml}
@@ -43,6 +42,7 @@
{$contentHtml}
</div>
{$footerHtml}
+ <script type="text/javascript" language="javascript"
src="{$wgExtensionAssetsPath}/MobileFrontend/javascripts/application.js?version=20110919T172820Z"></script>
</body>
</html>
EOT;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
