From 690fc7180a9f1dc5dfc77f8b2b31e866ce79510c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 17 Apr 2014 13:53:00 -0700 Subject: [PATCH] Defer requiring of $ in Package This is needed in the case that the package manager is being used in the browser process to open a URL. Closes #1869 --- src/package.coffee | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/package.coffee b/src/package.coffee index f51d9aea4..6ef7bc3b4 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -7,7 +7,7 @@ fs = require 'fs-plus' {Emitter} = require 'emissary' Q = require 'q' -{$} = require './space-pen-extensions' +$ = null # Defer require in case this is in the window-less browser process ScopedProperties = require './scoped-properties' # Loads and activates a package's main module and resources such as @@ -286,6 +286,7 @@ class Package handleActivationEvent: (event) => bubblePathEventHandlers = @disableEventHandlersOnBubblePath(event) @activateNow() + $ ?= require('./space-pen-extensions').$ $(event.target).trigger(event) @restoreEventHandlersOnBubblePath(bubblePathEventHandlers) @unsubscribeFromActivationEvents() @@ -303,6 +304,7 @@ class Package disableEventHandlersOnBubblePath: (event) -> bubblePathEventHandlers = [] disabledHandler = -> + $ ?= require('./space-pen-extensions').$ element = $(event.target) while element.length if eventHandlers = element.handlers()?[event.type]