aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/lib/util/javascript-hint.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-03 16:08:49 -0700
committerValerio Virgillito2012-05-03 16:08:49 -0700
commit0e1c87871489c1d5d8deb609174d8876eb579169 (patch)
treef37c26fbab9151e6c4f50e3e786bdc96b9960014 /imports/codemirror/lib/util/javascript-hint.js
parenteb17fe1bbd05ad260e8a56918a3b396a03767e04 (diff)
parent01ecdc4bda1aff7d39f429c76e57b10af6079c53 (diff)
downloadninja-0e1c87871489c1d5d8deb609174d8876eb579169.tar.gz
Merge pull request #192 from ananyasen/Codeview-improvements
submitting project : Code Editor Improvements [Phase 1]
Diffstat (limited to 'imports/codemirror/lib/util/javascript-hint.js')
-rw-r--r--imports/codemirror/lib/util/javascript-hint.js6
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];