From e76f39b2c3e71fb91c2a54f7a093a1d333d7d851 Mon Sep 17 00:00:00 2001 From: Adam Shaw Date: Mon, 26 May 2014 16:45:10 -0700 Subject: [PATCH] use jquery-simulate-ext instead of jquery-simulate --- bower.json | 2 +- karma.conf.js | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index cbfdc16..6c9f712 100644 --- a/bower.json +++ b/bower.json @@ -5,7 +5,7 @@ "moment": "2.6.0", "jquery": "~1.10.2", "jquery-ui": "~1.10.3", - "jquery-simulate": "*", + "jquery-simulate-ext": "~1.3.0", "jquery-mockjax": "~1.5.3", "jasmine-jquery": "~2.0.3", "jasmine-fixture": "~1.2.0" diff --git a/karma.conf.js b/karma.conf.js index f32c863..4e19963 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -13,11 +13,20 @@ module.exports = function(config) { 'lib/moment/moment.js', 'lib/jquery/jquery.js', 'lib/jquery-ui/ui/jquery-ui.js', - 'lib/jquery-simulate/jquery.simulate.js', + + // for jquery-simulate-ext + 'lib/jquery-simulate-ext/libs/bililiteRange.js', + 'lib/jquery-simulate-ext/libs/jquery.simulate.js', + 'lib/jquery-simulate-ext/src/jquery.simulate.ext.js', + 'lib/jquery-simulate-ext/src/jquery.simulate.drag-n-drop.js', + 'lib/jquery-simulate-ext/src/jquery.simulate.key-sequence.js', + 'lib/jquery-simulate-ext/src/jquery.simulate.key-combo.js', + 'lib/jquery-mockjax/jquery.mockjax.js', 'lib/jasmine-jquery/lib/jasmine-jquery.js', 'lib/jasmine-fixture/dist/jasmine-fixture.js', 'tests/lib/jasmine-ext.js', + 'build/out/fullcalendar.js', 'build/out/gcal.js', 'build/out/lang/all.js',