Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'origin/master' into jsd2
Conflicts:
	extension/content/firebug/console/consoleBase.js
	extension/modules/firebug-service.js
  • Loading branch information
SebastianZ committed Mar 21, 2014
2 parents 4473ad5 + 390c239 commit 171409d
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 9 deletions.
5 changes: 3 additions & 2 deletions extension/content/firebug/console/consoleBase.js
Expand Up @@ -3,11 +3,12 @@
define([
"firebug/firebug",
"firebug/lib/trace",
"firebug/lib/deprecated",
"firebug/lib/events",
"firebug/lib/options",
"firebug/lib/deprecated",
"firebug/chrome/panelNotification"
],
function(Firebug, FBTrace, Events, Options, Deprecated) {
function(Firebug, FBTrace, Deprecated, Events, Options, PanelNotification) {

"use strict";

Expand Down
22 changes: 15 additions & 7 deletions extension/content/firebug/css/computedPanel.js
Expand Up @@ -213,16 +213,24 @@ CSSComputedPanel.prototype = Obj.extend(Panel,
var props = [];
for (var i = 0; i < computedStyle.length; ++i)
{
var prop = this.cssLogic ? this.cssLogic.getPropertyInfo(computedStyle[i]) :
Firebug.CSSModule.getPropertyInfo(computedStyle, computedStyle[i]);
// xxxsz: There's a bug in the CssLogic module, which is caused by styles inherited
// from inline styles of ancestor elements. See issue 7269.
try
{
var prop = this.cssLogic ? this.cssLogic.getPropertyInfo(computedStyle[i]) :
Firebug.CSSModule.getPropertyInfo(computedStyle, computedStyle[i]);

if (isUnwantedProp(prop.property) ||
(this.cssLogic && !Firebug.showUserAgentCSS && prop.matchedRuleCount == 0))
{
continue;
}

if (isUnwantedProp(prop.property) ||
(this.cssLogic && !Firebug.showUserAgentCSS && prop.matchedRuleCount == 0))
props.push(prop);
}
catch (e)
{
continue;
}

props.push(prop);
}

var parentNode = this.template.computedStylesTag.replace({}, this.panelNode);
Expand Down

0 comments on commit 171409d

Please sign in to comment.