aboutsummaryrefslogtreecommitdiffstats
path: root/src/Angular.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/Angular.js')
-rw-r--r--src/Angular.js9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/Angular.js b/src/Angular.js
index b856aa24..9a1ab4a2 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -1032,5 +1032,12 @@ function angularJsConfig(document, config) {
function bindJQuery(){
// bind to jQuery if present;
jQuery = window.jQuery;
- angular.element = jqLite = jQuery || jqLiteWrap;
+ // reset to jQuery or default to us.
+ if (window.jQuery) {
+ jqLite = window.jQuery;
+ jqLite.fn.scope = JQLite.prototype.scope;
+ } else {
+ jqLite = jqLiteWrap;
+ }
+ angular.element = jqLite;
}