From 45bddda788afc27094b781d0823f821a421e0934 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Wed, 25 Apr 2012 14:18:09 -0700 Subject: - use on ctrl+space for code hinting - use prototype in serialization for montage 0.8 Signed-off-by: Ananya Sen --- .../ui/code-editor-view-options.reel/code-editor-view-options.html | 6 ++---- js/controllers/code-editor-controller.js | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html index 31e96adf..fadc4683 100644 --- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html +++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html @@ -18,8 +18,7 @@ }, "zoomHottext": { - "module": "js/components/hottextunit.reel", - "name": "HotTextUnit", + "prototype": "js/components/hottextunit.reel[HotTextUnit]", "properties": { "element": {"#": "zoomFont"}, "minValue":100, @@ -31,8 +30,7 @@ }, "owner":{ - "module": "js/code-editor/ui/code-editor-view-options.reel", - "name": "CodeEditorViewOptions", + "prototype": "js/code-editor/ui/code-editor-view-options.reel[CodeEditorViewOptions]", "properties": { "element": {"#": "viewOptions"}, "codeCompleteCheck":{"@": "codeCompleteCheck"}, diff --git a/js/controllers/code-editor-controller.js b/js/controllers/code-editor-controller.js index bce6f410..ab0521eb 100644 --- a/js/controllers/code-editor-controller.js +++ b/js/controllers/code-editor-controller.js @@ -112,7 +112,7 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone value: function(cm, keyEvent, type) { //===manually triggered code completion if((this.automaticCodeComplete === false)){ - if((keyEvent.ctrlKey || keyEvent.metaKey) && keyEvent.keyCode === 32){//Ctrl+Space + if(keyEvent.ctrlKey && keyEvent.keyCode === 32){//Ctrl+Space this.codeEditor.simpleHint(cm, this.codeEditor.javascriptHint); } } -- cgit v1.2.3