fix(utils): support window, array

naver · Jul 19, 2017 · 663ffeb · 663ffeb
1 parent fdbc233
commit 663ffeb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egjs/axes",
-  "version": "2.0.0-rc.1",
+  "version": "2.0.0-rc",
   "description": "A module used to change the information of user action entered by various input devices such as touch screen or mouse into logical coordinates within the virtual coordinate system. The coordinate information sorted by time events occurred is provided if animations are made by user actions.",
   "main": "dist/axes.js",
   "scripts": {

diff --git a/src/utils.ts b/src/utils.ts
@@ -19,12 +19,19 @@ export function $(param, multi = false) {
 		if (!multi) {
 			el = el.length >= 1 ? el[0] : undefined;
 		}
+	} else if (param === window) { // window
+		el = param;
 	} else if (param.nodeName &&
-	(param.nodeType === 1 || param.nodeType === 9)) {	// HTMLElement, Document
+		(param.nodeType === 1 || param.nodeType === 9)) {	// HTMLElement, Document
 		el = param;
 	} else if (("jQuery" in window && param instanceof jQuery) ||
 		param.constructor.prototype.jquery) {	// jQuery
 		el = multi ? param.toArray() : param.get(0);
+	} else if (Array.isArray(param)) {
+		el = param.map(v => $(v));
+		if (!multi) {
+			el = el.length >= 1 ? el[0] : undefined;
+		}
 	}
 	return el;
 }