From fec9ccee11ea21ffc95edce6e89d0d302b63e3d8 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 3 May 2012 16:18:00 -0700 Subject: Code reformatting Signed-off-by: Valerio Virgillito --- .../code-editor-view-options.js | 121 ++++++++++----------- js/ninja.reel/ninja.html | 24 ++-- 2 files changed, 66 insertions(+), 79 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 07561580..a27d4450 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 @@ -10,81 +10,70 @@ var Montage = require("montage/core/core").Montage, Component = require("montage/ui/component").Component; var CodeEditorViewOptions = exports.CodeEditorViewOptions = Montage.create(Component, { - hasReel: { - value: true - }, - prepareForDraw: { - value: function() { - Object.defineBinding(this.codeCompleteCheck , "checked", { - boundObject: this.application.ninja.codeEditorController, - boundObjectPropertyPath: "automaticCodeComplete", - oneway : false - }); + 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 - }); + Object.defineBinding(this.zoomHottext , "value", { + boundObject: this.application.ninja.codeEditorController, + boundObjectPropertyPath: "zoomFactor", + oneway : false + }); - } - }, + } + }, - willDraw: { - enumerable: false, - value: function() {} - }, - draw: { - enumerable: false, - value: function() {} - }, - 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); - } - }, + 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); - } - }, + 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); - } - }, + 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(); - } - }, + 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"); - } + 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 diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index a9dba720..34dc8135 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -196,13 +196,12 @@ } }, - - "editorViewOptions": { - "prototype": "js/code-editor/ui/code-editor-view-options.reel[CodeEditorViewOptions]", - "properties": { - "element": {"#": "editorViewOptions"} - } - }, + "editorViewOptions": { + "prototype": "js/code-editor/ui/code-editor-view-options.reel", + "properties": { + "element": {"#": "editorViewOptions"} + } + }, "panelContainer": { "prototype": "js/panels/PanelContainer.reel", @@ -270,7 +269,6 @@ "oneway": true } } - }, "documentController1": { @@ -320,7 +318,7 @@ }, "codeEditorController": { - "prototype": "js/controllers/code-editor-controller[CodeEditorController]" + "prototype": "js/controllers/code-editor-controller" }, "owner": { @@ -352,12 +350,12 @@ "ioMediator": {"@": "ioMediator"}, "timeline": {"@": "timeline"}, "mainMenuController": {"@": "mainMenuController"}, - "codeEditorController": {"@": "codeEditorController"}, + "codeEditorController": {"@": "codeEditorController"}, "rightPanelContainer": {"#": "rightPanelContainer" }, - "panelSplitter": {"@": "splitter3"}, + "panelSplitter": {"@": "splitter3"}, "timelineSplitter": {"@": "splitter4"}, - "toolsSplitter": {"@": "splitter2"}, - "optionsSplitter": {"@": "splitter1"} + "toolsSplitter": {"@": "splitter2"}, + "optionsSplitter": {"@": "splitter1"} } } } -- cgit v1.2.3