Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:firebug/firebug

  • Loading branch information...
commit 2f3d1e90d2e42f98150e94293846dcd83ca571fe 2 parents 9223919 + 21afebe
@janodvarko janodvarko authored
View
17 extension/content/firebug/chrome/panelActivation.js
@@ -6,10 +6,11 @@ define([
"firebug/chrome/firefox",
"firebug/lib/locale",
"firebug/lib/domplate",
+ "firebug/lib/xpcom",
"firebug/lib/url",
- "firebug/lib/dom",
+ "firebug/lib/dom"
],
-function(Obj, Firebug, Firefox, Locale, Domplate, Url, Dom) {
+function(Obj, Firebug, Firefox, Locale, Domplate, Xpcom, Url, Dom) {
// ************************************************************************************************
// Constants
@@ -18,7 +19,7 @@ const Cc = Components.classes;
const Ci = Components.interfaces;
const prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
-
+const prompts = Xpcom.CCSV("@mozilla.org/embedcomp/prompt-service;1", "nsIPromptService");
/**
* @module Implements Panel activation logic. A Firebug panel can support activation in order
@@ -222,6 +223,16 @@ Firebug.PanelActivation = Obj.extend(Firebug.Module,
clearAnnotations: function()
{
+ var check = {value: false};
+ var flags = prompts.BUTTON_POS_0 * prompts.BUTTON_TITLE_YES +
+ prompts.BUTTON_POS_1 * prompts.BUTTON_TITLE_NO;
+
+ if (!prompts.confirmEx(Firebug.chrome.window, Locale.$STR("Firebug"),
+ Locale.$STR("annotations.confirm.clear"), flags, "", "", "", null, check) == 0)
+ {
+ return;
+ }
+
Firebug.connection.clearAnnotations();
},
View
5 extension/locale/en-US/firebug.properties
@@ -82,6 +82,11 @@ firebug.menu.Right=Right
firebug.menu.tip.Right=Align Firebug to the right of the user agent window
firebug.uiLocation=Firebug UI Location
firebug.menu.tip.UI_Location=Position of the Firebug user interface
+
+# LOCALIZATION NOTE (annotations.confirm.clear):
+# Used in a confirmation dialog when all Firebug annotations are going to be deleted
+annotations.confirm.clear=Do you want to clear the list of Firebug annotations for all websites?
+
# LOCALIZATION NOTE (firebug_options): Tooltip text used for Firebug icon menu (them left
# most button on Firebug main toolbar)
firebug_options=Firebug Options
View
4 extension/skin/classic/breakpoint.css
@@ -8,10 +8,6 @@
border-top: none;
}
-.breakpointBlock > .breakpointHeader > .twisty {
- background-position: 4px 4px;
-}
-
.breakpointsHeaderLabel {
margin-left: 14px;
}
View
4 extension/skin/classic/css.css
@@ -106,10 +106,6 @@
display: none;
}
-.cssComputedHeader > .twisty {
- background-position: 4px 4px !important;
-}
-
.cssInheritLabel,
.cssComputedLabel {
margin-right: 0.25em;
View
3  extension/skin/classic/html.css
@@ -22,7 +22,8 @@
left: 0px;
top: 0px;
width: 14px;
- height: 14px;
+ height: 1em;
+ padding: 4px 0;
}
.nodeChildBox {
View
14 extension/skin/classic/mac/panel.css
@@ -25,7 +25,7 @@ body {
.cookieRow > .cookieNameCol > .cookieNameLabel {
background-image: url(chrome://firebug/skin/mac/twistyClosed.png);
background-repeat: no-repeat;
- background-position: 2px 3px;
+ background-position: 2px calc(0.5em - 3px);
}
.logRow-errorMessage > .hasTwisty.opened > .errorTitle,
@@ -36,24 +36,16 @@ body {
.nodeBox.highlightOpen > .nodeLabel > .twisty,
.nodeBox.open > .nodeLabel > .twisty,
.netRow.opened > .netCol > .netHrefLabel,
+.netPageRow.opened > .netCol > .netPageTitle,
.objectBox-stackFrame.hasTwisty.opened,
.objectBox-functionCall.hasTwisty.opened,
.computedStylesGroup.opened > .cssComputedHeader > .twisty,
-.netPageRow.opened > .netCol > .netPageTitle,
+.breakpointBlock.opened > .breakpointHeader > .twisty,
.computedStyle.hasSelectors.opened > .stylePropName,
.cookieRow.opened > .cookieNameCol > .cookieNameLabel {
background-image: url(chrome://firebug/skin/mac/twistyOpen.png);
}
-.memberRow.hasChildren > .memberLabelCell > .memberLabel,
-.hasHeaders .netHrefLabel {
- background-position: 2px 2px;
-}
-
-.twisty {
- background-position: 2px 1px;
-}
-
/************************************************************************************************/
/* Panel base */
View
6 extension/skin/classic/win/panel.css
@@ -19,7 +19,7 @@
.cookieRow > .cookieNameCol > .cookieNameLabel {
background-image: url(chrome://firebug/skin/win/twistyClosed.png);
background-repeat: no-repeat;
- background-position: 2px 2px;
+ background-position: 2px calc(0.5em - 3px);
min-height: 12px;
}
@@ -41,10 +41,6 @@
background-image: url(chrome://firebug/skin/win/twistyOpen.png);
}
-.twisty {
- background-position: 4px 4px;
-}
-
.hasHeaders .netHrefLabel,
.cookieRow > .cookieNameCol > .cookieNameLabel {
background-position: 2px 50%;
Please sign in to comment.
Something went wrong with that request. Please try again.