Fix simulator jquery when dependency

This commit is contained in:
Michael Schmatz 2014-05-18 12:56:32 -07:00
parent 38d732d8bc
commit 035cb7d3f7
2 changed files with 6 additions and 4 deletions

View file

@ -35,7 +35,7 @@ path = __dirname
m = require 'module' m = require 'module'
request = require 'request' request = require 'request'
Deferred = require "JQDeferred"
originalLoader = m._load originalLoader = m._load
unhook = () -> unhook = () ->
@ -90,6 +90,7 @@ GLOBAL.$ = GLOBAL.jQuery = (input) ->
append: (input)-> exports: ()-> append: (input)-> exports: ()->
cookies = request.jar() cookies = request.jar()
$.when = Deferred.when
$.ajax = (options) -> $.ajax = (options) ->
responded = false responded = false

View file

@ -56,7 +56,7 @@
"graceful-fs": "~2.0.1", "graceful-fs": "~2.0.1",
"node-force-domain": "~0.1.0", "node-force-domain": "~0.1.0",
"mailchimp-api": "2.0.x", "mailchimp-api": "2.0.x",
"express-useragent": "~0.0.9", "express-useragent": "~0.0.9",
"gridfs-stream": "0.4.x", "gridfs-stream": "0.4.x",
"stream-buffers": "0.2.x", "stream-buffers": "0.2.x",
"sendwithus": "2.0.x", "sendwithus": "2.0.x",
@ -66,7 +66,8 @@
"webworker-threads": "~0.4.11", "webworker-threads": "~0.4.11",
"node-gyp": "~0.13.0", "node-gyp": "~0.13.0",
"aether": "~0.2.3", "aether": "~0.2.3",
"JASON": "~0.1.3" "JASON": "~0.1.3",
"JQDeferred": "^2.1.0"
}, },
"devDependencies": { "devDependencies": {
"jade": "0.33.x", "jade": "0.33.x",
@ -97,7 +98,7 @@
"karma": "~0.10.9", "karma": "~0.10.9",
"karma-coverage": "~0.1.4", "karma-coverage": "~0.1.4",
"compressible": "~1.0.1", "compressible": "~1.0.1",
"jasmine-spec-reporter":"~0.3.0" "jasmine-spec-reporter": "~0.3.0"
}, },
"license": "MIT for the code, and CC-BY for the art and music", "license": "MIT for the code, and CC-BY for the art and music",
"private": true, "private": true,