From 4b1b72971567ea569a10c740e26aee33421e7bd5 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Tue, 3 Apr 2012 15:07:33 -0700
Subject: adding basic autocomplete

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 index.html                             | 6 ++++--
 js/stage/stage-view.reel/stage-view.js | 6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 37daee4b..fe52167d 100755
--- a/index.html
+++ b/index.html
@@ -21,6 +21,7 @@
 
         <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono' rel='stylesheet' type='text/css'>
         <link href="imports/codemirror/lib/codemirror.css" rel="stylesheet" type="text/css"/>
+        <link rel="stylesheet" href="imports/codemirror/lib/util/simple-hint.css">
 	
     	<style type="text/css">
 			html, body
@@ -185,6 +186,9 @@
         <script type="text/javascript" src="imports/codemirror/mode/css/css.js"></script>
         <script type="text/javascript" src="imports/codemirror/lib/util/searchcursor.js"></script>
         <script type="text/javascript" src="imports/codemirror/lib/util/match-highlighter.js"></script>
+        <script type="text/javascript" src="imports/codemirror/lib/util/simple-hint.js"></script>
+        <script type="text/javascript" src="imports/codemirror/lib/util/javascript-hint.js"></script>
+
 
     	<script type="text/javascript" src="node_modules/montage/montage.js"></script>
 
@@ -203,10 +207,8 @@
         </script>
 
         <style type="text/css">
-          .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
           span.CodeMirror-matchhighlight { background: #e9e9e9 }
           .CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important }
-          .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
           .activeline {background: #e8f2ff !important;}
           div.CodeMirror span.CodeMirror-matchingbracket {color: #000;background-color: #ffd500;}
           .CodeMirror-scroll {height: auto; overflow-y: hidden; overflow-x: auto; width: 100%;}
diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
index bee12838..28a66396 100755
--- a/js/stage/stage-view.reel/stage-view.js
+++ b/js/stage/stage-view.reel/stage-view.js
@@ -109,7 +109,11 @@ exports.StageView = Montage.create(Component, {
                        doc.editor.matchHighlight("CodeMirror-matchhighlight");
                        doc.editor.setLineClass(doc.editor.hline, null);
                        doc.editor.hline = doc.editor.setLineClass(doc.editor.getCursor().line, "activeline");
-                   }
+                   },
+                   extraKeys: {"Ctrl-Space": function(cm) {
+                                        CodeMirror.simpleHint(cm, CodeMirror.javascriptHint);
+                                    }
+                              }
            });
 
             doc.editor.hline = doc.editor.setLineClass(0, "activeline");
-- 
cgit v1.2.3