diff options
| author | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
| commit | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch) | |
| tree | ceb527713554f506c537168e36a10452cd09ad10 /imports/codemirror/lib/util/javascript-hint.js | |
| parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'imports/codemirror/lib/util/javascript-hint.js')
| -rw-r--r-- | imports/codemirror/lib/util/javascript-hint.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/imports/codemirror/lib/util/javascript-hint.js b/imports/codemirror/lib/util/javascript-hint.js index 2b904a51..2117e5af 100644 --- a/imports/codemirror/lib/util/javascript-hint.js +++ b/imports/codemirror/lib/util/javascript-hint.js | |||
| @@ -113,8 +113,10 @@ | |||
| 113 | base = 1; | 113 | base = 1; |
| 114 | else if (obj.className == "function") { | 114 | else if (obj.className == "function") { |
| 115 | if (window.jQuery != null && (obj.string == '$' || obj.string == 'jQuery') && | 115 | if (window.jQuery != null && (obj.string == '$' || obj.string == 'jQuery') && |
| 116 | (typeof jQuery == 'function')) base = jQuery(); | 116 | (typeof window.jQuery == 'function')) |
| 117 | else if (window._ != null && (obj.string == '_') && (typeof _ == 'function')) base = _(); | 117 | base = window.jQuery(); |
| 118 | else if (window._ != null && (obj.string == '_') && (typeof window._ == 'function')) | ||
| 119 | base = window._(); | ||
| 118 | } | 120 | } |
| 119 | while (base != null && context.length) | 121 | while (base != null && context.length) |
| 120 | base = base[context.pop().string]; | 122 | base = base[context.pop().string]; |