Bug 880735 part F - Remove extra functions, strings, and styles which are no longer needed, r=jaws

This commit is contained in:
Benjamin Smedberg 2013-06-24 08:51:07 -04:00
parent 5e06298e31
commit 45a6cc401e
5 changed files with 5 additions and 340 deletions

View File

@ -603,21 +603,6 @@ var gPluginHandler = {
gPluginHandler._showClickToPlayNotification(browser);
},
// returns true if there is a plugin on this page that needs activation
// and isn't in the "except these" list
_pluginNeedsActivationExceptThese: function PH_pluginNeedsActivationExceptThese(aExceptThese) {
let contentWindow = gBrowser.selectedBrowser.contentWindow;
let cwu = contentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils);
let pluginNeedsActivation = cwu.plugins.some(function(plugin) {
let objLoadingContent = plugin.QueryInterface(Ci.nsIObjectLoadingContent);
return (gPluginHandler.canActivatePlugin(objLoadingContent) &&
aExceptThese.indexOf(plugin) < 0);
});
return pluginNeedsActivation;
},
_clickToPlayNotificationEventCallback: function PH_ctpEventCallback(event) {
if (event == "showing") {
gPluginHandler._makeCenterActions(this);

View File

@ -104,14 +104,7 @@ installPlugin.button.label=Install %S
installPlugin.button.accesskey=I
installPlugin.ignoreButton.label=Don't ask again
installPlugin.ignoreButton.accesskey=N
outdatedpluginsMessage.title=Some plugins used by this page are out of date.
outdatedpluginsMessage.updateButton.label=Update Plugins…
outdatedpluginsMessage.updateButton.accesskey=U
blockedpluginsMessage.title=Some plugins required by this page have been blocked for your protection.
blockedpluginsMessage.infoButton.label=Details…
blockedpluginsMessage.infoButton.accesskey=D
blockedpluginsMessage.searchButton.label=Update Plugins…
blockedpluginsMessage.searchButton.accesskey=U
crashedpluginsMessage.title=The %S plugin has crashed.
crashedpluginsMessage.reloadButton.label=Reload page
crashedpluginsMessage.reloadButton.accesskey=R
@ -147,6 +140,7 @@ pluginActivateDisabled.manage=Manage plugins…
pluginEnabled.message="%S" is enabled on %S.
pluginEnabledOutdated.message=Outdated plugin "%S" is enabled on %S.
pluginEnabledVulnerable.message=Insecure plugin "%S" is enabled on %S.
pluginInfo.unknownPlugin=Unknown
# LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.dtd
# LOCALIZATION NOTE (pluginActivateNow.label): This button will enable the
@ -164,23 +158,10 @@ pluginBlockNow.accesskey=B
pluginContinue.label=Continue Allowing
pluginContinue.accesskey=C
activatePluginsMessage.message=Would you like to activate the plugins on this page?
activateAllPluginsMessage.label=Activate All Plugins
activatePluginsMessage.accesskey=A
activatePluginsMessage.always=Always activate plugins for this site
activatePluginsMessage.always.accesskey=c
activatePluginsMessage.never=Never activate plugins for this site
activatePluginsMessage.never.accesskey=N
activateSinglePlugin=Activate
# in-page UI
PluginClickToActivate=Activate %S.
# LOCALIZATION NOTE - "vulnerable" indicates there is a security bug in the
# plugin that is being exploited by attackers.
PluginVulnerableUpdatable=This plugin is vulnerable and should be updated.
PluginVulnerableNoUpdate=This plugin has security vulnerabilities.
vulnerableUpdatablePluginWarning=Outdated Version!
vulnerableNoUpdatePluginWarning=Vulnerable Plugin!
vulnerablePluginsMessage=Some plugins have been deactivated for your safety.
pluginInfo.unknownPlugin=Unknown
PluginVulnerableUpdatable=This plugin is unsafe and should be updated.
PluginVulnerableNoUpdate=This plugin is unsafe.
# Sanitize
# LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to

View File

@ -2214,104 +2214,11 @@ chatbox {
border-top-right-radius: 2.5px;
}
.click-to-play-plugins-notification-content {
margin: -10px;
}
.click-to-play-plugins-notification-icon-box {
-moz-border-end: 1px solid hsla(0,0%,100%,.2);
padding-top: 16px;
-moz-padding-start: 16px;
-moz-padding-end: 6px;
}
.click-to-play-plugins-notification-separator {
-moz-border-start: 1px solid hsla(211,79%,6%,.1);
border-top: 1px solid hsla(211,79%,6%,.1);
}
.click-to-play-plugins-notification-description-box {
border-bottom: 1px solid hsla(0,0%,100%,.2);
-moz-border-start: 1px solid hsla(0,0%,100%,.2);
padding: 14px 10px 9px 10px;
}
.click-to-play-plugins-notification-center-box {
border-top: 1px solid hsla(0,0%,100%,.2);
border-bottom: 1px solid hsla(0,0%,100%,.2);
background-color: hsla(211,79%,6%,.05);
}
.click-to-play-plugins-notification-button-container {
border-top: 1px solid hsla(0,0%,100%,.2);
-moz-border-start: 1px solid hsla(0,0%,100%,.2);
margin: 0px;
padding: 2px;
}
.center-item-box {
padding-top: 11px;
-moz-padding-start: 16px;
-moz-padding-end: 11px;
margin-bottom: -2px;
-moz-border-start: 1px solid hsla(0,0%,100%,.2);
}
.center-item-box[padbottom="true"] {
padding-bottom: 12px;
}
.center-item-icon {
background-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
background-repeat: no-repeat;
height: 16px;
width: 16px;
margin-bottom: 4px;
}
.center-item-box[warn="true"] {
background-image: url("chrome://browser/skin/click-to-play-warning-stripes.png");
background-repeat: repeat-x;
padding-top: 7px;
-moz-padding-end: 11px;
padding-bottom: 9px;
-moz-padding-start: 16px;
}
.center-item-box[padbottom="true"][warn="true"] {
padding-bottom: 7px;
}
.center-item-box[showseparator="true"] {
border-top: 1px solid hsla(211,79%,6%,.1);
}
.center-item-box[warn="false"] > .center-item-warning {
display: none;
}
.center-item-warning > .text-link {
color: #3d8cd7;
}
.center-item-warning > .text-link[href=""] {
display: none;
}
.center-item-warning-icon {
background-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
background-repeat: no-repeat;
width: 16px;
height: 15px;
margin-bottom: 4px;
}
.center-item-warning-description {
color: #828282;
}
.center-item-button {
min-width: 0;
}
#main-window[privatebrowsingmode=temporary] #TabsToolbar::before {

View File

@ -3867,118 +3867,11 @@ panel[type="arrow"][popupid="click-to-play-plugins"] > .panel-arrowcontainer > .
}
}
.click-to-play-plugins-notification-content {
margin: -16px;
border-radius: 5px;
}
.click-to-play-plugins-notification-icon-box {
background: hsla(0,0%,100%,.4);
-moz-border-end: 1px solid hsla(0,0%,100%,.2);
padding-top: 16px;
-moz-padding-end: 12px;
-moz-padding-start: 20px;
}
.click-to-play-plugins-notification-icon-box:-moz-locale-dir(ltr) {
border-bottom-left-radius: 5px;
border-top-left-radius: 5px;
}
.click-to-play-plugins-notification-icon-box:-moz-locale-dir(rtl) {
border-bottom-right-radius: 5px;
border-top-right-radius: 5px;
}
.click-to-play-plugins-notification-separator {
-moz-border-start: 1px solid hsla(211,79%,6%,.1);
border-top: 1px solid hsla(211,79%,6%,.1);
}
.click-to-play-plugins-notification-description-box {
border-bottom: 1px solid hsla(0,0%,100%,.2);
-moz-border-start: 1px solid hsla(0,0%,100%,.2);
max-width: 28em;
padding: 14px 16px 9px 16px;
}
.click-to-play-plugins-notification-center-box {
border-top: 1px solid hsla(0,0%,100%,.2);
border-bottom: 1px solid hsla(0,0%,100%,.2);
background-color: hsla(211,79%,6%,.05);
}
.click-to-play-plugins-notification-button-container {
border-top: 1px solid hsla(0,0%,100%,.2);
-moz-border-start: 1px solid hsla(0,0%,100%,.2);
margin: 0px;
padding: 2px;
}
.center-item-box {
-moz-border-start: 1px solid hsla(0,0%,100%,.2);
padding-top: 7px;
-moz-padding-end: 11px;
-moz-padding-start: 16px;
margin-bottom: -3px;
}
.center-item-box[padbottom="true"] {
padding-bottom: 12px;
}
.center-item-icon {
background-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
background-repeat: no-repeat;
height: 16px;
width: 16px;
margin-bottom: 4px;
-moz-margin-end: 6px;
}
.center-item-box[warn="true"] {
background-image: url("chrome://browser/skin/click-to-play-warning-stripes.png");
background-repeat: repeat-x;
padding-top: 3px;
-moz-padding-end: 11px;
padding-bottom: 9px;
-moz-padding-start: 16px;
}
.center-item-box[padbottom="true"][warn="true"] {
padding-bottom: 7px;
}
.center-item-box[showseparator="true"] {
border-top: 1px solid hsla(211,79%,6%,.1);
}
.center-item-box[warn="false"] > .center-item-warning {
display: none;
}
.center-item-warning > .text-link {
color: #3d8cd7;
}
.center-item-warning > .text-link[href=""] {
display: none;
}
.center-item-warning-icon {
background-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
background-repeat: no-repeat;
width: 16px;
height: 15px;
margin-bottom: 4px;
}
.center-item-warning-description {
color: #828282;
}
.center-item-button {
min-width: 0;
}
#main-window[privatebrowsingmode=temporary] {

View File

@ -2990,112 +2990,11 @@ chatbox {
border-top-right-radius: 2.5px;
}
.click-to-play-plugins-notification-content {
margin: -10px;
border-radius: 4px;
}
.click-to-play-plugins-notification-icon-box {
-moz-border-end: 1px solid hsla(0,0%,100%,.2);
padding-top: 16px;
-moz-padding-end: 16px;
-moz-padding-start: 24px;
}
.click-to-play-plugins-notification-icon-box:-moz-locale-dir(ltr) {
border-bottom-left-radius: 4px;
border-top-left-radius: 4px;
}
.click-to-play-plugins-notification-icon-box:-moz-locale-dir(rtl) {
border-bottom-right-radius: 4px;
border-top-right-radius: 4px;
}
.click-to-play-plugins-notification-separator {
-moz-border-start: 1px solid hsla(211,79%,6%,.1);
border-top: 1px solid hsla(211,79%,6%,.1);
}
.click-to-play-plugins-notification-description-box {
border-bottom: 1px solid hsla(0,0%,100%,.2);
-moz-border-start: 1px solid hsla(0,0%,100%,.2);
padding-top: 12px;
-moz-padding-end: 11px;
padding-bottom: 9px;
-moz-padding-start: 10px;
}
.click-to-play-plugins-notification-center-box {
border-top: 1px solid hsla(0,0%,100%,.2);
border-bottom: 1px solid hsla(0,0%,100%,.2);
-moz-border-start: 1px solid hsla(0,0%,100%,.2);
background-color: hsla(211,79%,6%,.05);
}
.click-to-play-plugins-notification-button-container {
border-top: 1px solid hsla(0,0%,100%,.2);
-moz-border-start: 1px solid hsla(0,0%,100%,.2);
margin: 0px;
padding: 2px;
}
.center-item-box {
padding: 12px 16px 0px 16px;
}
.center-item-box[padbottom="true"] {
padding-bottom: 12px;
}
.center-item-icon {
background-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
background-repeat: no-repeat;
height: 16px;
width: 16px;
margin-bottom: 4px;
}
.center-item-box[warn="true"] {
background-image: url("chrome://browser/skin/click-to-play-warning-stripes.png");
background-repeat: repeat-x;
padding: 8px 16px 6px 16px;
}
.center-item-box[padbottom="true"][warn="true"] {
padding-bottom: 4px;
}
.center-item-box[showseparator="true"] {
border-top: 1px solid hsla(211,79%,6%,.1);
}
.center-item-box[warn="false"] > .center-item-warning {
display: none;
}
.center-item-warning > .text-link {
color: #3d8cd7;
}
.center-item-warning > .text-link[href=""] {
display: none;
}
.center-item-warning-icon {
background-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
background-repeat: no-repeat;
width: 16px;
height: 15px;
margin-bottom: 4px;
}
.center-item-warning-description {
color: #828282;
}
.center-item-button {
min-width: 0;
}
#main-window[privatebrowsingmode=temporary] #toolbar-menubar {