author | Matthew Noorenberghe <mozilla@noorenberghe.ca> |
Fri, 25 Sep 2015 17:36:08 -0700 | |
changeset 264711 | 743f997646677cf32d7a59db3182fc367e1836c0 |
parent 264710 | 405c7f52a790cf400f25b12cc9883085e73185c6 |
child 264712 | 8b169aa6de69888c11a9ce6e436f78a74787041b |
push id | 65707 |
push user | cbook@mozilla.com |
push date | Mon, 28 Sep 2015 12:18:34 +0000 |
treeherder | mozilla-inbound@2c0e60a8f736 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bgrins |
bugs | 1208685 |
milestone | 44.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/toolkit/components/alerts/resources/content/alert.js +++ b/toolkit/components/alerts/resources/content/alert.js @@ -1,29 +1,23 @@ -// -*- indent-tabs-mode: nil; js-indent-level: 2 -*- - /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -Components.utils.import("resource://gre/modules/Services.jsm"); - -const Ci = Components.interfaces; -const Cc = Components.classes; - -var windowMediator = Cc["@mozilla.org/appshell/window-mediator;1"] - .getService(Ci.nsIWindowMediator); +const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components; // Copied from nsILookAndFeel.h, see comments on eMetric_AlertNotificationOrigin const NS_ALERT_HORIZONTAL = 1; const NS_ALERT_LEFT = 2; const NS_ALERT_TOP = 4; const WINDOW_MARGIN = 10; +Cu.import("resource://gre/modules/Services.jsm"); + var gOrigin = 0; // Default value: alert from bottom right. var gReplacedWindow = null; var gAlertListener = null; var gAlertTextClickable = false; var gAlertCookie = ""; var gIsReplaced = false; function prefillAlertInfo() { @@ -114,17 +108,17 @@ function onAlertLoad() { } } function moveWindowToReplace(aReplacedAlert) { let heightDelta = window.outerHeight - aReplacedAlert.outerHeight; // Move windows that come after the replaced alert if the height is different. if (heightDelta != 0) { - let windows = windowMediator.getEnumerator('alert:alert'); + let windows = Services.wm.getEnumerator('alert:alert'); while (windows.hasMoreElements()) { let alertWindow = windows.getNext(); // boolean to determine if the alert window is after the replaced alert. let alertIsAfter = gOrigin & NS_ALERT_TOP ? alertWindow.screenY > aReplacedAlert.screenY : aReplacedAlert.screenY > alertWindow.screenY; if (alertIsAfter) { // The new Y position of the window. @@ -144,17 +138,17 @@ function moveWindowToReplace(aReplacedAl function moveWindowToEnd() { // Determine position let x = gOrigin & NS_ALERT_LEFT ? screen.availLeft : screen.availLeft + screen.availWidth - window.outerWidth; let y = gOrigin & NS_ALERT_TOP ? screen.availTop : screen.availTop + screen.availHeight - window.outerHeight; // Position the window at the end of all alerts. - let windows = windowMediator.getEnumerator('alert:alert'); + let windows = Services.wm.getEnumerator('alert:alert'); while (windows.hasMoreElements()) { let alertWindow = windows.getNext(); if (alertWindow != window) { if (gOrigin & NS_ALERT_TOP) { y = Math.max(y, alertWindow.screenY + alertWindow.outerHeight); } else { y = Math.min(y, alertWindow.screenY - window.outerHeight); } @@ -167,17 +161,17 @@ function moveWindowToEnd() { window.moveTo(x, y); } function onAlertBeforeUnload() { if (!gIsReplaced) { // Move other alert windows to fill the gap left by closing alert. let heightDelta = window.outerHeight + WINDOW_MARGIN; - let windows = windowMediator.getEnumerator('alert:alert'); + let windows = Services.wm.getEnumerator('alert:alert'); while (windows.hasMoreElements()) { let alertWindow = windows.getNext(); if (alertWindow != window) { if (gOrigin & NS_ALERT_TOP) { if (alertWindow.screenY > window.screenY) { alertWindow.moveTo(alertWindow.screenX, alertWindow.screenY - heightDelta); } } else {
--- a/toolkit/themes/linux/global/alerts/alert.css +++ b/toolkit/themes/linux/global/alerts/alert.css @@ -1,65 +1,23 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /* ===== alert.css ===================================================== == Styles specific to the alerts dialog. ======================================================================= */ -@import url("chrome://global/skin/"); +@import url("chrome://global/skin/alerts/alert-common.css"); @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); .alertBox { border: 1px solid threedshadow; background-color: -moz-Dialog; } -.alertImageBox { - padding: 8px 0; - width: 64px; - background-image: linear-gradient(rgba(255,255,255,0.7), rgba(255,255,255,0.6)); - -moz-border-end: 1px solid rgba(0,0,0,.1); -} - -.alertTextBox { - padding: 8px; - -moz-padding-start: 16px; - width: 255px; -} - -.alertTextBox, -.alertCloseBox { - background-image: linear-gradient(rgba(255,255,255,0.2), rgba(255,255,255,0.1)); -} - -#alertNotification[clickable="true"]:hover .alertTextBox, -#alertNotification[clickable="true"]:hover .alertCloseBox { - background-image: linear-gradient(rgba(255,255,255,0.4), rgba(255,255,255,0.3)); -} - -.alertTitle { - font-weight: bold; - font-size: 110%; -} - -#alertImage { - max-width: 48px; - max-height: 48px; - list-style-image: url(chrome://global/skin/alerts/notification-48.png); -} - -#alertNotification[clickable="true"] { - cursor: pointer; -} - -label { - cursor: inherit; -} - .alertCloseButton { -moz-appearance: none; height: 16px; padding: 4px 2px; width: 16px; }
--- a/toolkit/themes/osx/global/alerts/alert.css +++ b/toolkit/themes/osx/global/alerts/alert.css @@ -1,79 +1,37 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /* ===== alert.css ===================================================== == Styles specific to the alerts dialog. ======================================================================= */ -@import url("chrome://global/skin/"); +@import url("chrome://global/skin/alerts/alert-common.css"); @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); #alertNotification { -moz-appearance: none; background: transparent; } .alertBox { border-radius: 5px; overflow: hidden; background-color: rgba(240,240,240,0.93); box-shadow: inset 0 0 0 1px rgba(255,255,255,0.3); } -.alertImageBox { - padding: 8px 0; - width: 64px; - background-image: linear-gradient(rgba(255,255,255,0.7), rgba(255,255,255,0.6)); - -moz-border-end: 1px solid rgba(0,0,0,.08); -} - .alertTitle, .alertTextBox { text-shadow: 0 1px white; } -.alertTextBox { - padding: 8px; - -moz-padding-start: 16px; - width: 255px; -} - -.alertTextBox, -.alertCloseBox { - background-image: linear-gradient(rgba(255,255,255,0.2), rgba(255,255,255,0.1)); -} - -#alertNotification[clickable="true"]:hover .alertTextBox, -#alertNotification[clickable="true"]:hover .alertCloseBox { - background-image: linear-gradient(rgba(255,255,255,0.4), rgba(255,255,255,0.3)); -} - -.alertTitle { - font-weight: bold; - font-size: 110%; -} - -#alertImage { - max-width: 48px; - max-height: 48px; - list-style-image: url(chrome://global/skin/alerts/notification-48.png); -} - -#alertNotification[clickable="true"] { - cursor: pointer; -} - -label { - cursor: inherit; -} - @keyframes alert-animation { from { opacity: 0; } 6.25% { opacity: 1; } 93.75% {
copy from toolkit/themes/linux/global/alerts/alert.css copy to toolkit/themes/shared/alert-common.css --- a/toolkit/themes/linux/global/alerts/alert.css +++ b/toolkit/themes/shared/alert-common.css @@ -1,25 +1,20 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /* ===== alert.css ===================================================== - == Styles specific to the alerts dialog. + == Shared styles specific to the alerts dialog. ======================================================================= */ @import url("chrome://global/skin/"); @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -.alertBox { - border: 1px solid threedshadow; - background-color: -moz-Dialog; -} - .alertImageBox { padding: 8px 0; width: 64px; background-image: linear-gradient(rgba(255,255,255,0.7), rgba(255,255,255,0.6)); -moz-border-end: 1px solid rgba(0,0,0,.1); } .alertTextBox { @@ -51,15 +46,8 @@ #alertNotification[clickable="true"] { cursor: pointer; } label { cursor: inherit; } - -.alertCloseButton { - -moz-appearance: none; - height: 16px; - padding: 4px 2px; - width: 16px; -}
--- a/toolkit/themes/shared/jar.inc.mn +++ b/toolkit/themes/shared/jar.inc.mn @@ -13,16 +13,17 @@ skin/classic/global/aboutMemory.css (../../shared/aboutMemory.css) skin/classic/global/aboutReader.css (../../shared/aboutReader.css) skin/classic/global/aboutReaderContent.css (../../shared/aboutReaderContent.css) * skin/classic/global/aboutReaderControls.css (../../shared/aboutReaderControls.css) skin/classic/global/aboutSupport.css (../../shared/aboutSupport.css) skin/classic/global/appPicker.css (../../shared/appPicker.css) skin/classic/global/config.css (../../shared/config.css) skin/classic/global/icons/warning.svg (../../shared/incontent-icons/warning.svg) + skin/classic/global/alerts/alert-common.css (../../shared/alert-common.css) skin/classic/global/menu/shared-menu-check@2x.png (../../shared/menu-check@2x.png) skin/classic/global/menu/shared-menu-check.png (../../shared/menu-check.png) skin/classic/global/menu/shared-menu-check-active.svg (../../shared/menu-check-active.svg) skin/classic/global/menu/shared-menu-check-black.svg (../../shared/menu-check-black.svg) skin/classic/global/menu/shared-menu-check-hover.svg (../../shared/menu-check-hover.svg) skin/classic/global/in-content/check.svg (../../shared/in-content/check.svg) skin/classic/global/in-content/check-partial.svg (../../shared/in-content/check-partial.svg) skin/classic/global/in-content/dropdown.svg (../../shared/in-content/dropdown.svg)
--- a/toolkit/themes/windows/global/alerts/alert.css +++ b/toolkit/themes/windows/global/alerts/alert.css @@ -1,68 +1,26 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /* ===== alert.css ===================================================== == Styles specific to the alerts dialog. ======================================================================= */ -@import url("chrome://global/skin/"); +@import url("chrome://global/skin/alerts/alert-common.css"); @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); .alertBox { border: 1px solid threedshadow; border-radius: 3px; background-color: -moz-Dialog; } -.alertImageBox { - padding: 8px 0; - width: 64px; - background-image: linear-gradient(rgba(255,255,255,0.7), rgba(255,255,255,0.6)); - -moz-border-end: 1px solid rgba(0,0,0,.1); -} - -.alertTextBox { - padding: 8px; - -moz-padding-start: 16px; - width: 255px; -} - -.alertTextBox, -.alertCloseBox { - background-image: linear-gradient(rgba(255,255,255,0.2), rgba(255,255,255,0.1)); -} - -#alertNotification[clickable="true"]:hover .alertTextBox, -#alertNotification[clickable="true"]:hover .alertCloseBox { - background-image: linear-gradient(rgba(255,255,255,0.4), rgba(255,255,255,0.3)); -} - -.alertTitle { - font-weight: bold; - font-size: 110%; -} - -#alertImage { - max-width: 48px; - max-height: 48px; - list-style-image: url(chrome://global/skin/alerts/notification-48.png); -} - -#alertNotification[clickable="true"] { - cursor: pointer; -} - -label { - cursor: inherit; -} - @keyframes alert-animation { from { opacity: 0; } 6.25% { opacity: 1; } 93.75% {