1 files changed, 38 insertions, 14 deletions

diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
index 1f471431..917cbeb5 100755
--- a/js/stage/stage-view.reel/stage-view.js
+++ b/js/stage/stage-view.reel/stage-view.js
@@ -93,23 +93,47 @@ exports.StageView = Montage.create(Component, {
 
             var documentController = this.application.ninja.documentController;
             doc.editor = CodeMirror.fromTextArea(doc.textArea, {
-                lineNumbers: true,
-                       mode: type,
-                       onChange: function(){
-                           var historySize = doc.editor.historySize();
-                           if(historySize.undo>0){
-                                doc.needsSave = true;
-                           }else if(historySize.undo===0 && historySize.redo>0){
-                               doc.needsSave = false;
-                           }
-                       },
-                       onCursorActivity: function() {
-                           //documentController._codeEditor.editor.setLineClass(documentController._codeEditor.hline, null);
-                           //documentController._codeEditor.hline = documentController._codeEditor.editor.setLineClass(documentController._codeEditor.editor.getCursor().line, "activeline");
+                   lineNumbers: true,
+                   lineWrapping: true,
+                   matchBrackets:true,
+                   mode: type,
+                   onChange: function(){
+                       var historySize = doc.editor.historySize();
+                       if(historySize.undo>0){
+                            doc.needsSave = true;
+                       }else if(historySize.undo===0 && historySize.redo>0){
+                           doc.needsSave = false;
                        }
+                   },
+                   onCursorActivity: function() {
+                       doc.editor.matchHighlight("CodeMirror-matchhighlight");
+                       doc.editor.setLineClass(doc.editor.hline, null, null);
+                       doc.editor.hline = doc.editor.setLineClass(doc.editor.getCursor().line, null, "activeline");
+                   },
+                   //extraKeys: {"Ctrl-Space": function(cm) {CodeMirror.simpleHint(cm, CodeMirror.javascriptHint);}}
+                   onKeyEvent: function(cm, keyEvent) {
+                        if((keyEvent.type === "keyup")//need seperate keycode set per mode
+                            && ((keyEvent.keyCode > 47 && keyEvent.keyCode < 57)//numbers
+                                || (keyEvent.keyCode > 64 && keyEvent.keyCode <91)//letters
+                                || (keyEvent.keyCode === 190)//period
+                                || (keyEvent.keyCode === 189)//underscore, dash
+                               )
+                            && !( (keyEvent.keyCode === 219)//open bracket [
+                                    || (keyEvent.keyCode === 221)//close bracket ]
+                                    || (keyEvent.shiftKey && keyEvent.keyCode === 219)//open bracket {
+                                    || (keyEvent.shiftKey && keyEvent.keyCode === 221)//close bracket }
+                                    || (keyEvent.shiftKey && keyEvent.keyCode === 57)//open bracket (
+                                    || (keyEvent.shiftKey && keyEvent.keyCode === 48)//close bracket )
+                               )
+                        ){
+
+                            CodeMirror.simpleHint(cm, CodeMirror.javascriptHint);
+                        }
+                   }
            });
 
-           //this.application.ninja.documentController._codeEditor.hline = this.application.ninja.documentController._codeEditor.editor.setLineClass(0, "activeline");
+            doc.editor.hline = doc.editor.setLineClass(0, "activeline");
+
             this.application.ninja.stage._scrollFlag = false;    // TODO HACK to prevent type error on Hide/Show Iframe
             this.application.ninja.documentController.activeDocument = doc;
             this.application.ninja.stage.hideCanvas(true);