Bug 1359290 - Fix "notifiction" typos. r?tcsc
MozReview-Commit-ID: 1d9QQUQckQW
--- a/devtools/client/shared/components/notification-box.js
+++ b/devtools/client/shared/components/notification-box.js
@@ -24,17 +24,17 @@ const PriorityLevels = {
PRIORITY_CRITICAL_LOW: 7,
PRIORITY_CRITICAL_MEDIUM: 8,
PRIORITY_CRITICAL_HIGH: 9,
PRIORITY_CRITICAL_BLOCK: 10,
};
/**
* This component represents Notification Box - HTML alternative for
- * <xul:notifictionbox> binding.
+ * <xul:notificationbox> binding.
*
* See also MDN for more info about <xul:notificationbox>:
* https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/notificationbox
*/
var NotificationBox = createClass({
displayName: "NotificationBox",
propTypes: {
--- a/widget/cocoa/OSXNotificationCenter.mm
+++ b/widget/cocoa/OSXNotificationCenter.mm
@@ -156,41 +156,41 @@ public:
NS_DECL_ISUPPORTS
OSXNotificationInfo(NSString *name, nsIObserver *observer,
const nsAString & alertCookie);
NSString *mName;
nsCOMPtr<nsIObserver> mObserver;
nsString mCookie;
RefPtr<nsICancelable> mIconRequest;
- id<FakeNSUserNotification> mPendingNotifiction;
+ id<FakeNSUserNotification> mPendingNotification;
};
NS_IMPL_ISUPPORTS0(OSXNotificationInfo)
OSXNotificationInfo::OSXNotificationInfo(NSString *name, nsIObserver *observer,
const nsAString & alertCookie)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
NS_ASSERTION(name, "Cannot create OSXNotificationInfo without a name!");
mName = [name retain];
mObserver = observer;
mCookie = alertCookie;
- mPendingNotifiction = nil;
+ mPendingNotification = nil;
NS_OBJC_END_TRY_ABORT_BLOCK;
}
OSXNotificationInfo::~OSXNotificationInfo()
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
[mName release];
- [mPendingNotifiction release];
+ [mPendingNotification release];
NS_OBJC_END_TRY_ABORT_BLOCK;
}
static id<FakeNSUserNotificationCenter> GetNotificationCenter() {
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
Class c = NSClassFromString(@"NSUserNotificationCenter");
@@ -399,17 +399,17 @@ OSXNotificationCenter::ShowAlertWithIcon
mActiveAlerts.AppendElement(osxni);
[GetNotificationCenter() deliverNotification:notification];
[notification release];
if (aAlertListener) {
aAlertListener->Observe(nullptr, "alertshow", cookie.get());
}
} else {
mPendingAlerts.AppendElement(osxni);
- osxni->mPendingNotifiction = notification;
+ osxni->mPendingNotification = notification;
// Wait six seconds for the image to load.
rv = aAlert->LoadImage(6000, this, osxni,
getter_AddRefs(osxni->mIconRequest));
if (NS_WARN_IF(NS_FAILED(rv))) {
ShowPendingNotification(osxni);
}
}
@@ -525,35 +525,35 @@ OSXNotificationCenter::ShowPendingNotifi
for (unsigned int i = 0; i < mPendingAlerts.Length(); i++) {
if (mPendingAlerts[i] == osxni) {
mActiveAlerts.AppendElement(osxni);
mPendingAlerts.RemoveElementAt(i);
break;
}
}
- [GetNotificationCenter() deliverNotification:osxni->mPendingNotifiction];
+ [GetNotificationCenter() deliverNotification:osxni->mPendingNotification];
if (osxni->mObserver) {
osxni->mObserver->Observe(nullptr, "alertshow", osxni->mCookie.get());
}
- [osxni->mPendingNotifiction release];
- osxni->mPendingNotifiction = nil;
+ [osxni->mPendingNotification release];
+ osxni->mPendingNotification = nil;
NS_OBJC_END_TRY_ABORT_BLOCK;
}
NS_IMETHODIMP
OSXNotificationCenter::OnImageMissing(nsISupports* aUserData)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
OSXNotificationInfo *osxni = static_cast<OSXNotificationInfo*>(aUserData);
- if (osxni->mPendingNotifiction) {
+ if (osxni->mPendingNotification) {
// If there was an error getting the image, or the request timed out, show
// the notification without a content image.
ShowPendingNotification(osxni);
}
return NS_OK;
NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
}
@@ -566,23 +566,23 @@ OSXNotificationCenter::OnImageReady(nsIS
nsCOMPtr<imgIContainer> image;
nsresult rv = aRequest->GetImage(getter_AddRefs(image));
if (NS_WARN_IF(NS_FAILED(rv) || !image)) {
return rv;
}
OSXNotificationInfo *osxni = static_cast<OSXNotificationInfo*>(aUserData);
- if (!osxni->mPendingNotifiction) {
+ if (!osxni->mPendingNotification) {
return NS_ERROR_FAILURE;
}
NSImage *cocoaImage = nil;
nsCocoaUtils::CreateNSImageFromImageContainer(image, imgIContainer::FRAME_FIRST, &cocoaImage, 1.0f);
- (osxni->mPendingNotifiction).contentImage = cocoaImage;
+ (osxni->mPendingNotification).contentImage = cocoaImage;
[cocoaImage release];
ShowPendingNotification(osxni);
return NS_OK;
NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
}