From b269041f386b2bdc395bccd913bbbfcbb44c0aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Bonveh=C3=AD?= Date: Fri, 23 Jan 2015 00:57:02 -0300 Subject: [PATCH] jquery.browser >=0.0.7 from master repo This closes issue #299, Update to latest jquery.browser as pointed out by @le717 --- bower.json | 2 +- main.js | 2 +- non_amd.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bower.json b/bower.json index b2323bdd9..67296aec2 100644 --- a/bower.json +++ b/bower.json @@ -23,7 +23,7 @@ "requirejs-text": "~2.0.12", "requirejs-tpl-jcbrand": "*", "momentjs": "~2.6.0", - "jquery.browser": "https://raw.githubusercontent.com/jcbrand/jquery-browser-plugin/ae5e88aa7a26f583e8865c3961ba857918c4c9c1/dist/jquery.browser.js", + "jquery.browser": ">=0.0.7", "jquery-easing-original": "https://raw.githubusercontent.com/jcbrand/jquery.easing/7de3458b1845a72c1f407debf6b223c8446396bf/jquery.easing.1.3.js", "bootstrap": "~3.2.0", "bootstrapJS": "https://raw.githubusercontent.com/jcbrand/bootstrap/7d96a5f60d26c67b5348b270a775518b96a702c8/dist/js/bootstrap.js", diff --git a/main.js b/main.js index bb41f070c..6eb9d6837 100644 --- a/main.js +++ b/main.js @@ -24,7 +24,7 @@ require.config({ "eventemitter": "components/otr/build/dep/eventemitter", "jquery": "components/jquery/dist/jquery", "jquery-private": "src/jquery-private", - "jquery.browser": "components/jquery.browser/index", + "jquery.browser": "components/jquery.browser/dist/jquery.browser", "jquery.easing": "components/jquery-easing-original/index", // XXX: Only required for https://conversejs.org website "moment": "components/momentjs/moment", "strophe": "components/strophe/strophe", diff --git a/non_amd.html b/non_amd.html index 027f68960..bb6df0bb4 100644 --- a/non_amd.html +++ b/non_amd.html @@ -41,7 +41,7 @@ - +