aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorAnanya Sen2012-04-25 14:18:09 -0700
committerAnanya Sen2012-04-25 14:18:09 -0700
commit45bddda788afc27094b781d0823f821a421e0934 (patch)
tree68519f28ea2bfa538555a56567e65487ab1f5f62 /js
parenta7548b4c53de8f42cb5e0fb1c054eba6f7c45afb (diff)
downloadninja-45bddda788afc27094b781d0823f821a421e0934.tar.gz
- use on ctrl+space for code hinting
- use prototype in serialization for montage 0.8 Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js')
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html6
-rw-r--r--js/controllers/code-editor-controller.js2
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 @@
18 }, 18 },
19 19
20 "zoomHottext": { 20 "zoomHottext": {
21 "module": "js/components/hottextunit.reel", 21 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
22 "name": "HotTextUnit",
23 "properties": { 22 "properties": {
24 "element": {"#": "zoomFont"}, 23 "element": {"#": "zoomFont"},
25 "minValue":100, 24 "minValue":100,
@@ -31,8 +30,7 @@
31 }, 30 },
32 31
33 "owner":{ 32 "owner":{
34 "module": "js/code-editor/ui/code-editor-view-options.reel", 33 "prototype": "js/code-editor/ui/code-editor-view-options.reel[CodeEditorViewOptions]",
35 "name": "CodeEditorViewOptions",
36 "properties": { 34 "properties": {
37 "element": {"#": "viewOptions"}, 35 "element": {"#": "viewOptions"},
38 "codeCompleteCheck":{"@": "codeCompleteCheck"}, 36 "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
112 value: function(cm, keyEvent, type) { 112 value: function(cm, keyEvent, type) {
113 //===manually triggered code completion 113 //===manually triggered code completion
114 if((this.automaticCodeComplete === false)){ 114 if((this.automaticCodeComplete === false)){
115 if((keyEvent.ctrlKey || keyEvent.metaKey) && keyEvent.keyCode === 32){//Ctrl+Space 115 if(keyEvent.ctrlKey && keyEvent.keyCode === 32){//Ctrl+Space
116 this.codeEditor.simpleHint(cm, this.codeEditor.javascriptHint); 116 this.codeEditor.simpleHint(cm, this.codeEditor.javascriptHint);
117 } 117 }
118 } 118 }