Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html

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 @@
         base = 1;
       else if (obj.className == "function") {
         if (window.jQuery != null && (obj.string == '$' || obj.string == 'jQuery') &&
-            (typeof jQuery == 'function')) base = jQuery();
-        else if (window._ != null && (obj.string == '_') && (typeof _ == 'function')) base = _();
+            (typeof window.jQuery == 'function'))
+          base = window.jQuery();
+        else if (window._ != null && (obj.string == '_') && (typeof window._ == 'function'))
+          base = window._();
       }
       while (base != null && context.length)
         base = base[context.pop().string];