Skip to content

replace CSSOM's CSSStyleDeclaration with mine #468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

replace CSSOM's CSSStyleDeclaration with mine #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c995040
swap out CSSOM's CSSStyleDeclaration for mine
chad3814 Jul 11, 2012
6b4eb1d
added Chad Walker to the contributors
chad3814 Jul 11, 2012
8d19fb7
corrected comment
chad3814 Jul 13, 2012
621d4e5
require version 0.2.x of cssstyle
chad3814 Jul 13, 2012
20875dc
added some more tests for the style property
chad3814 Jul 13, 2012
b5c2fc6
Updated to work with CSSStyleDeclaration 0.2.2
chad3814 Oct 8, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/jsdom/level2/style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ var core = require("./core").dom.level2.core,
html = require("./html").dom.level2.html,
utils = require("../utils"),
cssom = require("cssom"),
cssstyle = require("cssstyle"),
assert = require('assert');

// What works now:
Expand All @@ -28,7 +29,7 @@ core.CSSRule = cssom.CSSRule;
core.CSSStyleRule = cssom.CSSStyleRule;
core.CSSMediaRule = cssom.CSSMediaRule;
core.CSSImportRule = cssom.CSSImportRule;
core.CSSStyleDeclaration = cssom.CSSStyleDeclaration;
core.CSSStyleDeclaration = cssstyle.CSSStyleDeclaration;

// Relavant specs
// http://www.w3.org/TR/DOM-Level-2-Style (2000)
Expand Down Expand Up @@ -120,7 +121,7 @@ function scanForImportRules(cssRules, baseUrl) {

/**
* @param {string} data
* @param {cssom.CSSStyleDeclaration} style
* @param {cssstyle.CSSStyleDeclaration} style
*/
function evaluateStyleAttribute(data) {
// this is the element.
Expand Down Expand Up @@ -179,7 +180,7 @@ utils.intercept(core.AttrNodeMap, 'setNamedItem', function(_super, args, attr) {
html.HTMLElement.prototype.__defineGetter__('style', function() {
var style = this._cssStyleDeclaration;
if (!style) {
style = this._cssStyleDeclaration = new cssom.CSSStyleDeclaration();
style = this._cssStyleDeclaration = new cssstyle.CSSStyleDeclaration();
if (!this.getAttributeNode('style')) {
this.setAttribute('style', '');
}
Expand Down
8 changes: 7 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,11 @@
"name" : "Tiago Rodrigues",
"email" : "tmcrodrigues@gmail.com",
"web" : "http://trodrigues.net"
},
{
"name" : "Chad Walker",
"email" : "chad@chad-cat-lore-eddie.com",
"url" : "https://github.com/chad3814"
}
],
"bugs": {
Expand All @@ -165,7 +170,8 @@
"dependencies": {
"htmlparser" : "1.x",
"request" : "2.x",
"cssom" : "0.2.x",
"cssom" : ">=0.2.2",
"cssstyle" : "0.2.x",
"contextify" : "0.1.x"
},
"optionalDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion test/browser/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ exports.tests = {
doc.appendChild(doc.createElement('html'));
doc.documentElement.style.color = 'black';
doc.documentElement.style.backgroundColor = 'white';
test.equal(domToHtml.domToHtml(doc), '<html style="color: black; background-color: white"></html>\n', '');
test.equal(domToHtml.domToHtml(doc), '<html style="color: black; background-color: white;"></html>\n', '');
test.done();
},

Expand Down
15 changes: 13 additions & 2 deletions test/level2/style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ exports.tests = {

HTMLStyleAttribute01 : function (test) {
jsdom.env(
'<html><body><p style="color:red">',
'<html><body><p style="color:red; background-color: blue">',
jsdom.defaultLevel, function(err, win) {
var p = win.document.body.lastChild;
test.equal(1, p.style.length);
test.equal(2, p.style.length);
test.equal('color', p.style[0]);
test.equal('red', p.style.color);
test.equal('background-color', p.style[1]);
test.equal('blue', p.style.backgroundColor);
test.done();
});
},
Expand Down Expand Up @@ -60,6 +62,15 @@ exports.tests = {
test.equal(p.getAttribute('style'), 'width: 20px;');
p.style.removeProperty('width');
test.equal(p.getAttribute('style'), '');
p.style.cssText = 'background-color: blue; z-index: 12;';
test.equal(2, p.style.length);
test.equal('blue', p.style.backgroundColor);
test.equal('12', p.style.zIndex);
p.style.removeProperty('z-index');
test.equal(1, p.style.length);
p.style.backgroundColor = 'green';
test.equal('background-color: green;', p.style.cssText);
test.equal('background-color', p.style.item(0));
test.done();
});
},
Expand Down