Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/lib/geom/geom-obj.js
	js/lib/geom/rectangle.js
	js/tools/TagTool.js

1 files changed, 79 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
new file mode 100644
index 00000000..a27d4450
--- /dev/null
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
@@ -0,0 +1,79 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+////////////////////////////////////////////////////////////////////////
+//
+var Montage =           require("montage/core/core").Montage,
+    Component =         require("montage/ui/component").Component;
+
+var CodeEditorViewOptions = exports.CodeEditorViewOptions = Montage.create(Component, {
+
+    prepareForDraw: {
+        value: function() {
+            Object.defineBinding(this.codeCompleteCheck , "checked", {
+              boundObject: this.application.ninja.codeEditorController,
+              boundObjectPropertyPath: "automaticCodeComplete",
+              oneway : false
+            });
+
+            Object.defineBinding(this.zoomHottext , "value", {
+              boundObject: this.application.ninja.codeEditorController,
+              boundObjectPropertyPath: "zoomFactor",
+              oneway : false
+            });
+
+        }
+    },
+
+    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);
+            this.themeSelect.addEventListener("change", this.handleThemeSelection.bind(this), false);
+            this.shortKeys.addEventListener("click", this.handleShortKeys.bind(this), false);
+        }
+    },
+
+    handleFormat:{
+        value: function(evt){
+            this.application.ninja.codeEditorController.autoFormatSelection();
+        }
+    },
+    handleComment:{
+        value: function(evt){
+            this.application.ninja.codeEditorController.commentSelection(true);
+        }
+    },
+
+    handleUncomment:{
+        value: function(evt){
+            this.application.ninja.codeEditorController.commentSelection(false);
+        }
+    },
+
+    handleThemeSelection:{
+        value: function(evt){
+            this.application.ninja.codeEditorController.editorTheme = this.themeSelect.options[this.themeSelect.selectedIndex].value;
+            this.application.ninja.codeEditorController.handleThemeSelection();
+        }
+    },
+
+    handleShortKeys:{
+        value:function(evt){
+            var list = this.shortKeys.querySelector(".list");
+            if(list && list.classList.contains("hide")){
+                list.classList.remove("hide");
+                list.classList.add("show");
+            }else if(list && list.classList.contains("show")){
+                list.classList.remove("show");
+                list.classList.add("hide");
+            }
+        }
+    }
+
+});
\ No newline at end of file