1 files changed, 20 insertions, 0 deletions

diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
index a1ff8547..a381ae2a 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
@@ -42,7 +42,27 @@ var CodeEditorViewOptions = exports.CodeEditorViewOptions = Montage.create(Compo
         didDraw: {
             enumerable: false,
             value: function() {
+                this.format.addEventListener("click", this.handleFormat.bind(this), false);
+                this.comment.addEventListener("click", this.handleComment.bind(this), false);
+                this.uncomment.addEventListener("click", this.handleUncomment.bind(this), false);
+            }
+        },
+
+        handleFormat:{
+            value: function(){
+                this.application.ninja.codeEditorController.autoFormatSelection();
+            }
+        },
+        handleComment:{
+            value: function(){
+                this.application.ninja.codeEditorController.commentSelection(true);
+            }
+        },
 
+        handleUncomment:{
+            value: function(){
+                this.application.ninja.codeEditorController.commentSelection(false);
             }
         }
+
 });
\ No newline at end of file