Bug 903454 - Rename CssLogic.FILTER.ALL to CssLogic.FILTER.USER. r=jwalker

--HG--
extra : rebase_source : 7115356a488daa890b9c4dde0f57a9df5d5f27c6
This commit is contained in:
Dave Camp 2013-08-07 09:27:22 -07:00
Родитель 9383975f56
Коммит e1a4c3d6e7
2 изменённых файлов: 8 добавлений и 9 удалений

Просмотреть файл

@ -379,7 +379,7 @@ CssHtmlTree.prototype = {
this._matchedProperties = null;
this.cssLogic.sourceFilter = this.includeBrowserStyles ?
CssLogic.FILTER.UA :
CssLogic.FILTER.ALL;
CssLogic.FILTER.USER;
},
/**
@ -950,4 +950,4 @@ SelectorView.prototype = {
};
exports.CssHtmlTree = CssHtmlTree;
exports.PropertyView = PropertyView;
exports.PropertyView = PropertyView;

Просмотреть файл

@ -63,9 +63,8 @@ exports.CssLogic = CssLogic;
* Special values for filter, in addition to an href these values can be used
*/
CssLogic.FILTER = {
ALL: "user", // show properties from all user style sheets
USER: "user",
UA: "ua", // ALL, plus user-agent (i.e. browser) style sheets
USER: "user", // show properties for all user style sheets.
UA: "ua", // USER, plus user-agent (i.e. browser) style sheets
};
/**
@ -113,7 +112,7 @@ CssLogic.prototype = {
_computedStyle: null,
// Source filter. Only display properties coming from the given source
_sourceFilter: CssLogic.FILTER.ALL,
_sourceFilter: CssLogic.FILTER.USER,
// Used for tracking unique CssSheet/CssRule/CssSelector objects, in a run of
// processMatchedSelectors().
@ -591,7 +590,7 @@ CssLogic.prototype = {
sheet._passId = this._passId;
}
if (filter === CssLogic.FILTER.ALL && !sheet.contentSheet) {
if (filter === CssLogic.FILTER.USER && !sheet.contentSheet) {
continue;
}
@ -989,10 +988,10 @@ CssSheet.prototype = {
this._sheetAllowed = true;
let filter = this._cssLogic.sourceFilter;
if (filter === CssLogic.FILTER.ALL && !this.contentSheet) {
if (filter === CssLogic.FILTER.USER && !this.contentSheet) {
this._sheetAllowed = false;
}
if (filter !== CssLogic.FILTER.ALL && filter !== CssLogic.FILTER.UA) {
if (filter !== CssLogic.FILTER.USER && filter !== CssLogic.FILTER.UA) {
this._sheetAllowed = (filter === this.href);
}