0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

Ox.$: remove unused var, better height/width, fix typo in .map

Browse source
This commit is contained in:
rlx 2016-02-15 13:17:52 +05:30
parent 869a5ef5ee
commit 7f8403d89f
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/Ox/js/DOM.js
View file

@ -134,7 +134,7 @@ Ox.$ = Ox.element = function $(value) {
value <s> Attribute value value <s> Attribute value
@*/ @*/
attr: function attr() { attr: function attr() {
var args = arguments, ret, that = this; var args = arguments, ret;
if (args.length == 1 && Ox.isString(args[0])) { if (args.length == 1 && Ox.isString(args[0])) {
ret = this[0].getAttribute ret = this[0].getAttribute
? this[0].getAttribute(args[0]) ? this[0].getAttribute(args[0])
@ -299,7 +299,11 @@ Ox.$ = Ox.element = function $(value) {
() -> <n> Height in px () -> <n> Height in px
@*/ @*/
height: function height() { height: function height() {
return elements[0].offsetHeight; return elements[0][
elements[0] == document ? 'height'
: elements[0] == window ? 'innerHeight'
: 'offsetHeight'
];
}, },
/*@ /*@
@ -384,7 +388,7 @@ Ox.$ = Ox.element = function $(value) {
iterator <f> Iterator function iterator <f> Iterator function
@*/ @*/
map: function map() { map: function map() {
return Array.prototype.filter.map(elements, arguments); return Array.prototype.map.apply(elements, arguments);
}, },
/*@ /*@
@ -781,7 +785,11 @@ Ox.$ = Ox.element = function $(value) {
() -> <n> Width in px () -> <n> Width in px
@*/ @*/
width: function width() { width: function width() {
return elements[0].offsetWidth; return elements[0][
elements[0] == document ? 'width'
: elements[0] == window ? 'innerWidth'
: 'offsetWidth'
];
} }
}) : null; }) : null;