mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 988283 - Show full path to CSS file on link hover. r=bgrins

This commit is contained in:
Thomas Andersen 2014-04-04 20:24:27 +02:00
Родитель 608c063223
Коммит c7798ee317
4 изменённых файлов: 44 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

31
browser/devtools/styleinspector/rule-view.js
Просмотреть файл

@ -488,16 +488,21 @@ Rule.prototype = {
* for this rule's style sheet.
*
* @return {Promise}
* Promise which resolves with location as a string.
* Promise which resolves with location as an object containing
* both the full and short version of the source string.
*/
getOriginalSourceString: function() {
if (this._originalSourceString) {
return promise.resolve(this._originalSourceString);
getOriginalSourceStrings: function() {
if (this._originalSourceStrings) {
return promise.resolve(this._originalSourceStrings);
}
return this.domRule.getOriginalLocation().then(({href, line}) => {
let string = CssLogic.shortSource({href: href}) + ":" + line;
this._originalSourceString = string;
return string;
let sourceStrings = {
full: href + ":" + line,
short: CssLogic.shortSource({href: href}) + ":" + line
};
this._originalSourceStrings = sourceStrings;
return sourceStrings;
});
},
@ -1748,13 +1753,17 @@ RuleEditor.prototype = {
{
let sourceLabel = this.element.querySelector(".source-link-label");
sourceLabel.setAttribute("value", this.rule.title);
sourceLabel.setAttribute("tooltiptext", this.rule.title);
let sourceHref = (this.rule.sheet && this.rule.sheet.href) ?
this.rule.sheet.href : this.rule.title;
sourceLabel.setAttribute("tooltiptext", sourceHref);
let showOrig = Services.prefs.getBoolPref(PREF_ORIG_SOURCES);
if (showOrig && this.rule.domRule.type != ELEMENT_STYLE) {
this.rule.getOriginalSourceString().then((string) => {
sourceLabel.setAttribute("value", string);
sourceLabel.setAttribute("tooltiptext", string);
this.rule.getOriginalSourceStrings().then((strings) => {
sourceLabel.setAttribute("value", strings.short);
sourceLabel.setAttribute("tooltiptext", strings.full);
})
}
},

2
browser/devtools/styleinspector/test/browser.ini
Просмотреть файл

@ -15,6 +15,8 @@ skip-if = true # awaiting promise-based init
[browser_bug_692400_element_style.js]
[browser_csslogic_inherited.js]
[browser_ruleview_734259_style_editor_link.js]
support-files =
browser_ruleview_734259_style_editor_link.css
[browser_ruleview_editor.js]
[browser_ruleview_editor_changedvalues.js]
[browser_ruleview_copy.js]

3
browser/devtools/styleinspector/test/browser_ruleview_734259_style_editor_link.css Normal file
Просмотреть файл

@ -0,0 +1,3 @@
div {
opacity: 1;
}

20
browser/devtools/styleinspector/test/browser_ruleview_734259_style_editor_link.js
Просмотреть файл

@ -17,6 +17,9 @@ const STYLESHEET_URL = "data:text/css,"+encodeURIComponent(
"color: blue",
"}"].join("\n"));
const EXTERNAL_STYLESHEET_FILE_NAME = "browser_ruleview_734259_style_editor_link.css"
const EXTERNAL_STYLESHEET_URL = TEST_BASE_HTTP + EXTERNAL_STYLESHEET_FILE_NAME;
const DOCUMENT_URL = "data:text/html,"+encodeURIComponent(
['<html>' +
'<head>' +
@ -28,6 +31,7 @@ const DOCUMENT_URL = "data:text/html,"+encodeURIComponent(
'font-size: 14pt; font-family: helvetica, sans-serif; color: #AAA">',
'</style>',
'<link rel="stylesheet" type="text/css" href="'+STYLESHEET_URL+'">',
'<link rel="stylesheet" type="text/css" href="'+EXTERNAL_STYLESHEET_URL+'">',
'</head>',
'<body>',
'<h1>Some header text</h1>',
@ -111,7 +115,7 @@ function testInlineStyleSheet()
});
});
let link = getLinkByIndex(2);
let link = getLinkByIndex(4);
link.scrollIntoView();
link.click();
}
@ -127,12 +131,26 @@ function testExternalStyleSheet(toolbox) {
});
toolbox.selectTool("inspector").then(function () {
testRuleViewLinkLabel();
let link = getLinkByIndex(1);
link.scrollIntoView();
link.click();
});
}
function testRuleViewLinkLabel()
{
let link = getLinkByIndex(2);
let labelElem = link.querySelector(".source-link-label");
let value = labelElem.getAttribute("value");
let tooltipText = labelElem.getAttribute("tooltiptext");
is(value, EXTERNAL_STYLESHEET_FILE_NAME + ":1",
"rule view stylesheet display value matches filename and line number");
is(tooltipText, EXTERNAL_STYLESHEET_URL,
"rule view stylesheet tooltip text matches the full URI path");
}
function validateStyleEditorSheet(aEditor, aExpectedSheetIndex)
{
info("validating style editor stylesheet");