From 611ef8cbd0b5ad986faf9a46f7b4fb62a5991ebe Mon Sep 17 00:00:00 2001 From: Jim Hoskins Date: Wed, 18 Jan 2012 17:33:21 -0500 Subject: [PATCH] Check for existence of window to allow for use outside of the browser Added existence check for window to allow loading Spine from an environment without a window object --- lib/spine.js | 2 +- src/spine.coffee | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/spine.js b/lib/spine.js index 94e89ced..a8b53a6b 100644 --- a/lib/spine.js +++ b/lib/spine.js @@ -707,7 +707,7 @@ })(Module); - $ = window.jQuery || window.Zepto || function(element) { + $ = (typeof window !== "undefined" && window !== null ? window.jQuery : void 0) || (typeof window !== "undefined" && window !== null ? window.Zepto : void 0) || function(element) { return element; }; diff --git a/src/spine.coffee b/src/spine.coffee index c14058d9..d86639d7 100644 --- a/src/spine.coffee +++ b/src/spine.coffee @@ -470,7 +470,7 @@ class Controller extends Module # Utilities & Shims -$ = window.jQuery or window.Zepto or (element) -> element +$ = window?.jQuery or window?.Zepto or (element) -> element unless typeof Object.create is 'function' Object.create = (o) -> @@ -527,4 +527,4 @@ Model.setup = (name, attributes = []) -> Module.init = Controller.init = Model.init = (a1, a2, a3, a4, a5) -> new this(a1, a2, a3, a4, a5) -Spine.Class = Module \ No newline at end of file +Spine.Class = Module