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

7 files changed, 281 insertions, 195 deletions

diff --git a/js/controllers/code-editor-controller.js b/js/controllers/code-editor-controller.js
new file mode 100644
index 00000000..7913cfc1
--- /dev/null
+++ b/js/controllers/code-editor-controller.js
@@ -0,0 +1,258 @@
+/* <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 CodeEditorController = exports.CodeEditorController = Montage.create(Component, {
+    hasTemplate: {
+        value: false
+    },
+
+    _codeEditor : {
+        value:null
+    },
+
+    codeEditor:{
+        get: function(){return this._codeEditor;},
+        set: function(value){this._codeEditor = value;}
+    },
+
+    codeCompletionSupport : {
+        value: {"js": true}
+    },
+
+    _automaticCodeComplete: {
+        value:false
+    },
+
+    automaticCodeComplete:{
+        get: function(){return this._automaticCodeComplete;},
+        set: function(value){this._automaticCodeComplete = value;}
+    },
+
+    _editorTheme: {
+        value:"default"
+    },
+
+    editorTheme:{
+        get: function(){return this._editorTheme;},
+        set: function(value){this._editorTheme = value;}
+    },
+
+    _zoomFactor:{
+        value:100
+    },
+
+    zoomFactor:{
+        get: function(){return this._zoomFactor;},
+        set: function(value){
+            this.handleZoom(value);
+        }
+    },
+
+    deserializedFromTemplate: {
+        value: function() {
+            //TODO:add logic to check some configuration file to load the right code editor
+            this.codeEditor = CodeMirror;
+        }
+    },
+
+    /**
+     * Public method
+     * Creates an editor instance
+     */
+    createEditor : {
+        value:function(doc, type, documentType){
+            var self = this, editorOptions = null;
+
+            editorOptions = {
+                               lineNumbers: 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");
+                               }
+                           };
+
+            //configure auto code completion if it is supported for that document type
+            if(this.codeCompletionSupport[documentType] === true){
+                editorOptions.onKeyEvent = function(cm, keyEvent){self._codeCompletionKeyEventHandler.call(self, cm, keyEvent, documentType)};
+            }
+
+            var editor = self.codeEditor.fromTextArea(doc.textArea, editorOptions);
+
+            //editor.setOption("theme", "night");
+
+            return editor;
+        }
+    },
+
+    /**
+     * Private method
+     * key event handler for showing code completion dropdown
+     */
+    _codeCompletionKeyEventHandler:{
+        enumerable:false,
+        value: function(cm, keyEvent, documentType) {
+            //comment shortkeys
+            if((keyEvent.metaKey || keyEvent.ctrlKey) && !keyEvent.shiftKey && keyEvent.keyCode === 191){//ctrl+/
+                this.commentSelection(true);
+                return;
+            }
+            //uncomment shortkeys
+            if((keyEvent.metaKey || keyEvent.ctrlKey) && keyEvent.shiftKey && keyEvent.keyCode === 191){//ctrl+shift+/
+                this.commentSelection(false);
+                return;
+            }
+
+            //===manually triggered code completion
+            if((this.automaticCodeComplete === false)){
+                if(keyEvent.ctrlKey && keyEvent.keyCode === 32){//Ctrl+Space
+                    this.codeEditor.simpleHint(cm, this.codeEditor.javascriptHint);
+                }
+            }
+            //===automatic auto complete [performance is slower]
+            else if(this._showAutoComplete(documentType, keyEvent)){
+                this.codeEditor.simpleHint(cm, this.codeEditor.javascriptHint);
+            }
+       }
+    },
+
+    /**
+     * Private method
+     * checks for valid keyset to show code completion dropdown
+     */
+    _showAutoComplete : {
+        enumerable:false,
+        value:function(documentType, keyEvent){
+            var status=false;
+
+            if((keyEvent.metaKey || keyEvent.ctrlKey) &&  (keyEvent.keyCode === 83)){//ctrl+s
+                return false;
+            }
+
+            switch(documentType){
+                case "js":
+                    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.ctrlKey //ctrl
+                            || keyEvent.metaKey//cmd
+                            || (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 )
+                           )
+                    ){
+                        status = true;
+                        break;
+                    }
+                default :
+                    status = false;
+            }
+
+            return status;
+        }
+    },
+
+    handleCodeCompletionSupport:{
+        value:function(fileType){
+            var autoCodeCompleteElem = document.getElementsByClassName("autoCodeComplete")[0], elems=null, i=0;
+            if(autoCodeCompleteElem){
+                elems = autoCodeCompleteElem.getElementsByTagName("*");
+            }
+
+            if(elems && (this.codeCompletionSupport[fileType] === true)){
+                //enable elements
+                for(i=0;i<elems.length;i++){
+                    if(elems[i].hasAttribute("disabled")){
+                        elems[i].removeAttribute("disabled");
+                    }
+                    if(elems[i].classList.contains("disabled")){
+                        elems[i].classList.remove("disabled");
+                    }
+                }
+            }else if(elems && !this.codeCompletionSupport[fileType]){
+                //disable elements
+                for(i=0;i<elems.length;i++){
+                    if(!elems[i].hasAttribute("disabled")){
+                        elems[i].setAttribute("disabled", "disabled");
+                    }
+                    if(!elems[i].classList.contains("disabled")){
+                        elems[i].classList.add("disabled");
+                    }
+                }
+            }
+        }
+    },
+
+    getSelectedRange:{
+        value:function(editor){
+            return { from: editor.getCursor(true), to: editor.getCursor(false) };
+        }