jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Making sure people don't confuse the two notification
systems.
......................................................................
Hygiene: Making sure people don't confuse the two notification systems.
Differentiate Toast notifications from Echo notifications and make
sure it's clear which is being used.
Change-Id: I0a5ec34e556d8e71be4aeab1446bbb9d118b9c77
---
M includes/Resources.php
R javascripts/common/toast.js
M javascripts/modules/editor/EditorOverlay.js
M javascripts/modules/editor/editor.js
M javascripts/modules/editorNew/EditorOverlay.js
M javascripts/modules/editorNew/VisualEditorOverlay.js
M javascripts/modules/mf-watchstar.js
M javascripts/modules/notifications/notifications.js
M javascripts/modules/talk/TalkSectionOverlay.js
M javascripts/modules/uploads/PhotoUploader.js
M javascripts/modules/uploads/PhotoUploaderButton.js
M javascripts/modules/uploads/PhotoUploaderPreview.js
M javascripts/modules/uploads/lead-photo-init.js
M javascripts/modules/uploadsNew/PhotoUploadOverlay.js
M javascripts/modules/uploadsNew/PhotoUploader.js
M javascripts/specials/uploads.js
R less/common/toast.less
M less/mobile.less
18 files changed, 25 insertions(+), 21 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 8d7e502..0f3e04c 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -672,7 +672,7 @@
'mobile.toast.styles' => $wgMFMobileResourceBoilerplate + array(
'styles' => array(
- 'less/common/notifications.less',
+ 'less/common/toast.less',
),
'position' => 'top',
),
@@ -759,7 +759,7 @@
'javascripts/common/Drawer.js',
'javascripts/common/CtaDrawer.js',
'javascripts/widgets/progress-bar.js',
- 'javascripts/common/notification.js',
+ 'javascripts/common/toast.js',
'javascripts/common/Page.js',
'javascripts/modules/uploads/PhotoUploaderButton.js',
),
diff --git a/javascripts/common/notification.js b/javascripts/common/toast.js
similarity index 89%
rename from javascripts/common/notification.js
rename to javascripts/common/toast.js
index 7a4d200..87d2d4b 100644
--- a/javascripts/common/notification.js
+++ b/javascripts/common/toast.js
@@ -15,6 +15,6 @@
}
} );
- M.define( 'notifications', new Toast() );
+ M.define( 'toast', new Toast() );
}( mw.mobileFrontend ) );
diff --git a/javascripts/modules/editor/EditorOverlay.js
b/javascripts/modules/editor/EditorOverlay.js
index 65c8991..89a35ba 100644
--- a/javascripts/modules/editor/EditorOverlay.js
+++ b/javascripts/modules/editor/EditorOverlay.js
@@ -4,7 +4,7 @@
user = M.require( 'user' ),
Page = M.require( 'Page' ),
schema = M.require( 'loggingSchemas/mobileWebEditing' ),
- popup = M.require( 'notifications' ),
+ popup = M.require( 'toast' ),
api = M.require( 'api' ),
inBetaOrAlpha = M.isBetaGroupMember(),
inCampaign = M.query.campaign ? true : false,
diff --git a/javascripts/modules/editor/editor.js
b/javascripts/modules/editor/editor.js
index b5bec97..a3d2e18 100644
--- a/javascripts/modules/editor/editor.js
+++ b/javascripts/modules/editor/editor.js
@@ -3,7 +3,7 @@
var
inStable = mw.config.get( 'wgMFMode' ) === 'stable',
user = M.require( 'user' ),
- popup = M.require( 'notifications' ),
+ popup = M.require( 'toast' ),
isUserBlocked = mw.config.get( 'wgMFIsUserBlocked' ),
// FIXME: Disable on IE < 10 for time being
blacklisted = /MSIE \d\./.test( navigator.userAgent ),
diff --git a/javascripts/modules/editorNew/EditorOverlay.js
b/javascripts/modules/editorNew/EditorOverlay.js
index b4d0fd1..b83e872 100644
--- a/javascripts/modules/editorNew/EditorOverlay.js
+++ b/javascripts/modules/editorNew/EditorOverlay.js
@@ -3,7 +3,7 @@
var EditorOverlayBase = M.require(
'modules/editorNew/EditorOverlayBase' ),
user = M.require( 'user' ),
Page = M.require( 'Page' ),
- popup = M.require( 'notifications' ),
+ popup = M.require( 'toast' ),
api = M.require( 'api' ),
inBetaOrAlpha = M.isBetaGroupMember(),
inKeepGoingCampaign = M.query.campaign === 'mobile-keepgoing',
diff --git a/javascripts/modules/editorNew/VisualEditorOverlay.js
b/javascripts/modules/editorNew/VisualEditorOverlay.js
index e6f1994..4dc67ec 100644
--- a/javascripts/modules/editorNew/VisualEditorOverlay.js
+++ b/javascripts/modules/editorNew/VisualEditorOverlay.js
@@ -1,7 +1,7 @@
( function( M, $, ve ) {
var EditorOverlayBase = M.require(
'modules/editorNew/EditorOverlayBase' ),
Page = M.require( 'Page' ),
- popup = M.require( 'notifications' ),
+ popup = M.require( 'toast' ),
VisualEditorOverlay;
VisualEditorOverlay = EditorOverlayBase.extend( {
diff --git a/javascripts/modules/mf-watchstar.js
b/javascripts/modules/mf-watchstar.js
index bd1c46b..28797f5 100644
--- a/javascripts/modules/mf-watchstar.js
+++ b/javascripts/modules/mf-watchstar.js
@@ -2,7 +2,7 @@
( function( M, $ ) {
var api = M.require( 'api' ), w = ( function() {
- var popup = M.require( 'notifications' ),
+ var popup = M.require( 'toast' ),
CtaDrawer = M.require( 'CtaDrawer' ),
user = M.require( 'user' ),
drawer = new CtaDrawer( {
diff --git a/javascripts/modules/notifications/notifications.js
b/javascripts/modules/notifications/notifications.js
index 199768b..40c3c5e 100644
--- a/javascripts/modules/notifications/notifications.js
+++ b/javascripts/modules/notifications/notifications.js
@@ -1,3 +1,7 @@
+/**
+ * This code loads the necessary modules for the notifications overlay, not to
be confused
+ * with the Toast notifications defined by common/toast.js.
+ */
( function( M, $ ) {
var useNewOverlays = M.isBetaGroupMember(),
LoadingOverlay = useNewOverlays ? M.require(
'LoadingOverlayNew' ) : M.require( 'LoadingOverlay' );
diff --git a/javascripts/modules/talk/TalkSectionOverlay.js
b/javascripts/modules/talk/TalkSectionOverlay.js
index d3e22ca..f5f2e11 100644
--- a/javascripts/modules/talk/TalkSectionOverlay.js
+++ b/javascripts/modules/talk/TalkSectionOverlay.js
@@ -2,7 +2,7 @@
var
Overlay = M.require( 'Overlay' ),
- popup = M.require( 'notifications' ),
+ popup = M.require( 'toast' ),
api = M.require( 'api' ),
user = M.require( 'user' ),
TalkSectionOverlay = Overlay.extend( {
diff --git a/javascripts/modules/uploads/PhotoUploader.js
b/javascripts/modules/uploads/PhotoUploader.js
index cbedce4..03098c3 100644
--- a/javascripts/modules/uploads/PhotoUploader.js
+++ b/javascripts/modules/uploads/PhotoUploader.js
@@ -1,7 +1,7 @@
( function( M, $ ) {
var Class = M.require( 'Class' ),
user = M.require( 'user' ),
- popup = M.require( 'notifications' ),
+ popup = M.require( 'toast' ),
NagOverlay = M.require( 'modules/uploads/NagOverlay' ),
PhotoApi = M.require( 'modules/uploads/PhotoApi' ),
PhotoUploadProgress = M.require(
'modules/uploads/PhotoUploadProgress' ),
diff --git a/javascripts/modules/uploads/PhotoUploaderButton.js
b/javascripts/modules/uploads/PhotoUploaderButton.js
index 7f9c7be..962ad47 100644
--- a/javascripts/modules/uploads/PhotoUploaderButton.js
+++ b/javascripts/modules/uploads/PhotoUploaderButton.js
@@ -1,6 +1,6 @@
( function( M, $ ) {
var View = M.require( 'view' ),
- popup = M.require( 'notifications' ),
+ popup = M.require( 'toast' ),
user = M.require( 'user' ),
PhotoUploaderButton,
LeadPhotoUploaderButton;
diff --git a/javascripts/modules/uploads/PhotoUploaderPreview.js
b/javascripts/modules/uploads/PhotoUploaderPreview.js
index 0a0888a..4e9897c 100644
--- a/javascripts/modules/uploads/PhotoUploaderPreview.js
+++ b/javascripts/modules/uploads/PhotoUploaderPreview.js
@@ -1,5 +1,5 @@
( function( M, $ ) {
- var popup = M.require( 'notifications' ),
+ var popup = M.require( 'toast' ),
user = M.require( 'user' ),
Overlay = M.require( 'Overlay' ),
LearnMoreOverlay = M.require(
'modules/uploads/LearnMoreOverlay' ),
diff --git a/javascripts/modules/uploads/lead-photo-init.js
b/javascripts/modules/uploads/lead-photo-init.js
index 858e73e..05baccb 100644
--- a/javascripts/modules/uploads/lead-photo-init.js
+++ b/javascripts/modules/uploads/lead-photo-init.js
@@ -3,7 +3,7 @@
var
funnel = $.cookie( 'mwUploadsFunnel' ) || 'article',
user = M.require( 'user' ),
- popup = M.require( 'notifications' ),
+ popup = M.require( 'toast' ),
LeadPhotoUploaderButton = M.require(
'modules/uploads/LeadPhotoUploaderButton' ),
PhotoUploaderButton = M.require(
'modules/uploads/PhotoUploaderButton' ),
isSupported = PhotoUploaderButton.isSupported;
diff --git a/javascripts/modules/uploadsNew/PhotoUploadOverlay.js
b/javascripts/modules/uploadsNew/PhotoUploadOverlay.js
index ca15440..b4e1e34 100644
--- a/javascripts/modules/uploadsNew/PhotoUploadOverlay.js
+++ b/javascripts/modules/uploadsNew/PhotoUploadOverlay.js
@@ -1,5 +1,5 @@
( function( M, $ ) {
- var popup = M.require( 'notifications' ),
+ var popup = M.require( 'toast' ),
user = M.require( 'user' ),
OverlayNew = M.require( 'OverlayNew' ),
UploadTutorial = M.require( 'modules/uploads/UploadTutorial' ),
diff --git a/javascripts/modules/uploadsNew/PhotoUploader.js
b/javascripts/modules/uploadsNew/PhotoUploader.js
index 738c8ac..d3b1686 100644
--- a/javascripts/modules/uploadsNew/PhotoUploader.js
+++ b/javascripts/modules/uploadsNew/PhotoUploader.js
@@ -1,7 +1,7 @@
( function( M, $ ) {
var Class = M.require( 'Class' ),
user = M.require( 'user' ),
- popup = M.require( 'notifications' ),
+ popup = M.require( 'toast' ),
PhotoApi = M.require( 'modules/uploads/PhotoApi' ),
PhotoUploadProgress = M.require(
'modules/uploadsNew/PhotoUploadProgress' ),
PhotoUploadOverlay = M.require(
'modules/uploadsNew/PhotoUploadOverlay' ),
diff --git a/javascripts/specials/uploads.js b/javascripts/specials/uploads.js
index c0eff3f..06d61ba 100644
--- a/javascripts/specials/uploads.js
+++ b/javascripts/specials/uploads.js
@@ -2,7 +2,7 @@
var
PhotoUploaderButton = M.require( 'modules/uploads/PhotoUploaderButton'
),
user = M.require( 'user' ),
- popup = M.require( 'notifications' ),
+ popup = M.require( 'toast' ),
Api = M.require( 'api' ).Api,
View = M.require( 'view' ),
corsUrl = mw.config.get( 'wgMFPhotoUploadEndpoint' ),
diff --git a/less/common/notifications.less b/less/common/toast.less
similarity index 96%
rename from less/common/notifications.less
rename to less/common/toast.less
index 5ef0c61..eadb121 100644
--- a/less/common/notifications.less
+++ b/less/common/toast.less
@@ -1,7 +1,7 @@
@import "../mixins.less";
@toastNotificationColor: #373737;
-// Notifications
+// Toast notifications
//
// Styleguide 3.
@@ -15,7 +15,7 @@
width: 100%;
}
-// Toast notification
+// Basic toast notification
//
// Toast must have visible class to be shown
//
@@ -97,7 +97,7 @@
// An error occurred.
// </div>
//
- // Styleguide 3.1.1.
+ // Styleguide 3.2.
&.error {
background-image: url(../common/images/error.png);
background-position: 16px 50%;
@@ -116,7 +116,7 @@
// It's your birthday!
// </div>
//
- // Styleguide 3.1.2.
+ // Styleguide 3.3.
&.landmark {
color: #F7F737;
}
diff --git a/less/mobile.less b/less/mobile.less
index 98aa3bf..6f3e114 100644
--- a/less/mobile.less
+++ b/less/mobile.less
@@ -10,7 +10,7 @@
@import 'common/typography.less';
@import 'common/buttons.less';
@import 'common/drawer.less';
-@import 'common/notifications.less';
+@import 'common/toast.less';
@import 'common/pagelist.less';
@import 'common/common-js.less';
@import 'common/OverlayNew.less';
--
To view, visit https://gerrit.wikimedia.org/r/104653
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0a5ec34e556d8e71be4aeab1446bbb9d118b9c77
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Kaldari <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
