Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/96081
Change subject: Stop flash of last modified bar
......................................................................
Stop flash of last modified bar
* Move last modified code to top of page
* Provide a top-bar-loaded event that can be subscribed to
Change-Id: Ia24c6ff4efc4c5286f69c5e1acc86e16ac9cf73c
---
M includes/Resources.php
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMobileBeta.php
M javascripts/modules/lastEdited/lastEditedBeta.js
A javascripts/specials/app.js
5 files changed, 33 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/81/96081/1
diff --git a/includes/Resources.php b/includes/Resources.php
index 8479fc6..b1be993 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -154,6 +154,29 @@
'javascripts/common/Class.js',
'javascripts/common/eventemitter.js',
'javascripts/common/navigation.js',
+ 'javascripts/modules/lastEdited/time.js',
+ ),
+ 'position' => 'top',
+ ),
+
+ 'mobile.head.beta' => $wgMFMobileResourceBoilerplate + array(
+ 'dependencies' => array(
+ 'mobile.head',
+ 'mediawiki.language',
+ 'mediawiki.jqueryMsg',
+ ),
+ 'scripts' => array(
+ 'javascripts/modules/lastEdited/lastEditedBeta.js',
+ ),
+ 'messages' => array(
+ // LastEditedBeta.js
+ 'mobile-frontend-last-modified-with-user-seconds',
+ 'mobile-frontend-last-modified-with-user-minutes',
+ 'mobile-frontend-last-modified-with-user-hours',
+ 'mobile-frontend-last-modified-with-user-days',
+ 'mobile-frontend-last-modified-with-user-months',
+ 'mobile-frontend-last-modified-with-user-years',
+ 'mobile-frontend-last-modified-with-user-just-now',
),
'position' => 'top',
),
@@ -439,7 +462,6 @@
'javascripts/modules/mediaViewer.js',
'javascripts/modules/search/pageImages.js',
'javascripts/modules/languages/preferred.js',
- 'javascripts/modules/lastEdited/lastEditedBeta.js',
'javascripts/modules/keepgoing/keepgoing.js',
),
'templates' => array(
@@ -454,15 +476,6 @@
// for talk.js
'mobile-frontend-talk-overlay-header',
-
- // LastEditedBeta.js
- 'mobile-frontend-last-modified-with-user-seconds',
- 'mobile-frontend-last-modified-with-user-minutes',
- 'mobile-frontend-last-modified-with-user-hours',
- 'mobile-frontend-last-modified-with-user-days',
- 'mobile-frontend-last-modified-with-user-months',
- 'mobile-frontend-last-modified-with-user-years',
- 'mobile-frontend-last-modified-with-user-just-now',
// mediaViewer.js
'mobile-frontend-media-details',
@@ -666,7 +679,6 @@
'javascripts/modules/mf-toggle.js',
'javascripts/modules/issues/issues.js',
'javascripts/modules/languages/languages.js',
- 'javascripts/modules/lastEdited/time.js',
'javascripts/modules/uploads/lead-photo-init.js',
'javascripts/modules/mainmenutweaks.js',
'javascripts/modules/search/search.js',
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index e09ded2..a9f3704 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -113,6 +113,11 @@
$historyLabel = $historyLink['text'];
unset( $historyLink['text'] );
echo Html::element( 'a', $historyLink, $historyLabel );
+ ?>
+ <script>
+ mw.mobileFrontend.emit( 'top-bar-loaded' );
+ </script>
+ <?php
}
}
diff --git a/includes/skins/SkinMobileBeta.php
b/includes/skins/SkinMobileBeta.php
index 975b1f2..079ddd0 100644
--- a/includes/skins/SkinMobileBeta.php
+++ b/includes/skins/SkinMobileBeta.php
@@ -53,6 +53,7 @@
public function getDefaultModules() {
$modules = parent::getDefaultModules();
+ $modules['mobile'][] = 'mobile.head.beta';
$modules['beta'] = array( 'mobile.beta' );
$modules['beta'][] = 'mobile.geonotahack';
// turn off stable only modules
diff --git a/javascripts/modules/lastEdited/lastEditedBeta.js
b/javascripts/modules/lastEdited/lastEditedBeta.js
index 9513f1d..8dd8922 100644
--- a/javascripts/modules/lastEdited/lastEditedBeta.js
+++ b/javascripts/modules/lastEdited/lastEditedBeta.js
@@ -2,7 +2,7 @@
M.assertMode( [ 'beta', 'alpha' ] );
-var module = ( function() {
+( function() {
var time = M.require( 'modules/lastEdited/time' );
/**
@@ -53,12 +53,7 @@
}
}
M.on( 'page-loaded', init );
-
- return {
- init: init
- };
+ M.on( 'top-bar-loaded', init );
}() );
-
-M.define( 'last-modified-beta', module );
}( mw.mobileFrontend, jQuery ) );
diff --git a/javascripts/specials/app.js b/javascripts/specials/app.js
new file mode 100644
index 0000000..63451c5
--- /dev/null
+++ b/javascripts/specials/app.js
@@ -0,0 +1,2 @@
+// TODO:
+// Cache pages in localStorage
--
To view, visit https://gerrit.wikimedia.org/r/96081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia24c6ff4efc4c5286f69c5e1acc86e16ac9cf73c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
