Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 28 additions & 2 deletions lib/computed.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
var debug = require('debug')('css:computed');
var withinDocument = require('within-document');
var styles = require('./styles');
var camelcase = require('to-camel-case');
var hooks = require('./hooks');

/**
* Expose `computed`
Expand Down Expand Up @@ -36,8 +38,7 @@ function computed(el, prop, precomputed) {

if ('' === ret && !withinDocument(el)) {
debug('element not within document, try finding from style attribute');
var style = require('./style');
ret = style(el, prop);
ret = get(el, prop);
}

debug('computed value of %s: %s', prop, ret);
Expand All @@ -46,3 +47,28 @@ function computed(el, prop, precomputed) {
// IE returns zIndex value as an integer.
return undefined === ret ? ret : ret + '';
}

/**
* Get the style
*
* @param {Element} el
* @param {String} prop
* @param {Mixed} extra
* @return {String}
*/

function get(el, prop, extra) {
var style = el.style;
var hook = hooks[prop] || hooks[orig];
var orig = camelcase(prop);
var ret;

if (hook && hook.get && undefined !== (ret = hook.get(el, false, extra))) {
debug('get hook defined, returning: %s', ret);
return ret;
}

ret = style[prop];
debug('getting %s', ret);
return ret;
}
27 changes: 1 addition & 26 deletions lib/style.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function style(el, prop, val, extra) {
var style = el.style;
var type = typeof val;

if (!val) return get(el, prop, orig, extra);
if (!val && val !== '') return;

prop = property(prop, style);

Expand Down Expand Up @@ -79,28 +79,3 @@ function style(el, prop, val, extra) {
}

}

/**
* Get the style
*
* @param {Element} el
* @param {String} prop
* @param {String} orig
* @param {Mixed} extra
* @return {String}
*/

function get(el, prop, orig, extra) {
var style = el.style;
var hook = hooks[prop] || hooks[orig];
var ret;

if (hook && hook.get && undefined !== (ret = hook.get(el, false, extra))) {
debug('get hook defined, returning: %s', ret);
return ret;
}

ret = style[prop];
debug('getting %s', ret);
return ret;
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "component-css",
"description": "DOM element css helper",
"version": "0.0.5",
"version": "0.0.6",
"keywords": [],
"dependencies": {
"debug": "*",
Expand Down
9 changes: 9 additions & 0 deletions test/css.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,4 +223,13 @@ describe('css(prop)', function() {
assert('1000' == css(div, 'z-index'));
el.removeChild(div);
});

it('should unset styles', function() {
var div = domify('<div>');
el.appendChild(div);
css(div, 'display', 'none');
css(div, 'display', '');
assert('block' == css(div, 'display'));
el.removeChild(div);
});
});