From fbdd97e7b1743efe2b0362e589c489aa23e29751 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 9 Jul 2012 12:10:09 -0700
Subject: Removed the customized xq-dark and lesser-dark themes temporarily
 until copyright legalities determined

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 index.html                                         |  2 -
 .../codemirror-ninja/theme/lesser-dark-ninja.css   | 78 ----------------------
 .../codemirror-ninja/theme/xq-dark-ninja.css       | 78 ----------------------
 .../code-editor-view-options.html                  |  2 -
 4 files changed, 160 deletions(-)
 delete mode 100644 js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
 delete mode 100644 js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css

diff --git a/index.html b/index.html
index 8486b498..d5c7c1bb 100755
--- a/index.html
+++ b/index.html
@@ -53,8 +53,6 @@ POSSIBILITY OF SUCH DAMAGE.
         <link rel="stylesheet" href="imports/codemirror/theme/cobalt.css">
         <link rel="stylesheet" href="imports/codemirror/theme/eclipse.css">
         <link rel="stylesheet" href="js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css">
-        <link rel="stylesheet" href="js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css">
-        <link rel="stylesheet" href="js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css">
 
 	
     	<style type="text/css">
diff --git a/js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css b/js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
deleted file mode 100644
index b185a924..00000000
--- a/js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
+++ /dev/null
@@ -1,78 +0,0 @@
-/* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
-All Rights Reserved.
-BSD License.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  - Neither the name of Motorola Mobility nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-</copyright> */
-
-/* adopted from CodeMirror 2.23 (http://codemirror.net/) */
-
-/*
-http://lesscss.org/ dark theme
-Ported to CodeMirror by Peter Kroon
-*/
-
-.CodeMirror{
-  line-height: 15px;
-}
-.cm-s-lesser-dark {
-  font-family: 'Bitstream Vera Sans Mono', 'DejaVu Sans Mono', 'Monaco', Courier, monospace !important;
-  /*font-size:12px;*/
-}
-
-.cm-s-lesser-dark { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
-.cm-s-lesser-dark div.CodeMirror-selected {background: #45443B !important;} /* 33322B*/
-.cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
-.cm-s-lesser-dark .CodeMirror-lines { margin-left:3px; margin-right:3px; }/*editable code holder*/
-
-div.CodeMirror span.CodeMirror-matchingbracket { color: #7EFC7E; }/*65FC65*/
-
-.cm-s-lesser-dark .CodeMirror-gutter { background: #262626; border-right:1px solid #aaa; padding-right:3px; min-width:2.5em; }
-.cm-s-lesser-dark .CodeMirror-gutter-text { color: #777; }
-
-.cm-s-lesser-dark span.cm-keyword { color: #599eff; }
-.cm-s-lesser-dark span.cm-atom { color: #C2B470; }
-.cm-s-lesser-dark span.cm-number { color: #B35E4D; }
-.cm-s-lesser-dark span.cm-def {color: color: white;}
-.cm-s-lesser-dark span.cm-variable { color:#D9BF8C; }
-.cm-s-lesser-dark span.cm-variable-2 { color: #669199; }
-.cm-s-lesser-dark span.cm-variable-3 { color: white; }
-.cm-s-lesser-dark span.cm-property {color: #92A75C;}
-.cm-s-lesser-dark span.cm-operator {color: #92A75C;}
-.cm-s-lesser-dark span.cm-comment { color: #666; }
-.cm-s-lesser-dark span.cm-string { color: #BCD279; }
-.cm-s-lesser-dark span.cm-string-2 {color: #f50;}
-.cm-s-lesser-dark span.cm-meta { color: #738C73; }
-.cm-s-lesser-dark span.cm-error { color: #9d1e15; }
-.cm-s-lesser-dark span.cm-qualifier {color: #555;}
-.cm-s-lesser-dark span.cm-builtin { color: #ff9e59; }
-.cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; }
-.cm-s-lesser-dark span.cm-tag { color: #669199; }
-.cm-s-lesser-dark span.cm-attribute {color: #00c;}
-.cm-s-lesser-dark span.cm-header {color: #a0a;}
-.cm-s-lesser-dark span.cm-quote {color: #090;}
-.cm-s-lesser-dark span.cm-hr {color: #999;}
-.cm-s-lesser-dark span.cm-link {color: #00c;}
diff --git a/js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css b/js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css
deleted file mode 100644
index 62239203..00000000
--- a/js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css
+++ /dev/null
@@ -1,78 +0,0 @@
-/* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
-All Rights Reserved.
-BSD License.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  - Neither the name of Motorola Mobility nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-</copyright> */
-
-/* adopted from CodeMirror 2.23 (http://codemirror.net/) */
-
-/*
-Copyright (C) 2011 by MarkLogic Corporation
-Author: Mike Brevoort <mike@brevoort.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-.cm-s-xq-dark { background: #0a001f; color: #f8f8f8; }
-.cm-s-xq-dark span.CodeMirror-selected { background: #044259 !important; }
-.cm-s-xq-dark .CodeMirror-gutter { background: #0a001f; border-right: 1px solid #aaa; }
-.cm-s-xq-dark .CodeMirror-gutter-text { color: #f8f8f8; }
-.cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
-
-.cm-s-xq-dark span.cm-keyword {color: #FFBD40;}
-.cm-s-xq-dark span.cm-atom {color: #6C8CD5;}
-.cm-s-xq-dark span.cm-number {color: #164;}
-.cm-s-xq-dark span.cm-def {color: #FFF; text-decoration:underline;}
-.cm-s-xq-dark span.cm-variable {color: #FFF;}
-.cm-s-xq-dark span.cm-variable-2 {color: #EEE;}
-.cm-s-xq-dark span.cm-variable-3 {color: #DDD;}
-.cm-s-xq-dark span.cm-property {}
-.cm-s-xq-dark span.cm-operator {}
-.cm-s-xq-dark span.cm-comment {color: gray;}
-.cm-s-xq-dark span.cm-string {color: #9FEE00;}
-.cm-s-xq-dark span.cm-meta {color: yellow;}
-.cm-s-xq-dark span.cm-error {color: #f00;}
-.cm-s-xq-dark span.cm-qualifier {color: #FFF700;}
-.cm-s-xq-dark span.cm-builtin {color: #30a;}
-.cm-s-xq-dark span.cm-bracket {color: #cc7;}
-.cm-s-xq-dark span.cm-tag {color: #FFBD40;}
-.cm-s-xq-dark span.cm-attribute {color: #FFF700;}
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 de4d81ce..1435c57c 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
@@ -100,8 +100,6 @@ POSSIBILITY OF SUCH DAMAGE.
                 <option value="cobalt" >COBALT</option>
                 <option value="eclipse" >ECLIPSE</option>
                 <option value="rubyblue" >RUBYBLUE</option>
-                <option value="lesser-dark" >LESSER-DARK</option>
-                <option value="xq-dark" >XQ-DARK</option>
             </select>
         </div>
         <div data-montage-id="shortKeys" class="shortKeys">
-- 
cgit v1.2.3


From bf9dba001ec84243e2f12cd13b0c0ae020fba4a2 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 9 Jul 2012 12:23:13 -0700
Subject: removed unnecessary todo comments

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/clipboard/external-apps-clipboard-agent.js         | 9 ++++-----
 js/clipboard/internal-ops/elements-clipboard-agent.js | 7 ++-----
 js/code-editor/code-editor-wrapper.js                 | 1 -
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/js/clipboard/external-apps-clipboard-agent.js b/js/clipboard/external-apps-clipboard-agent.js
index 92d72dcb..fd128ba7 100644
--- a/js/clipboard/external-apps-clipboard-agent.js
+++ b/js/clipboard/external-apps-clipboard-agent.js
@@ -74,7 +74,6 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
         }
     },
 
-    //todo: this will be moved to a seperate api
     pasteImageBinary:{
         value: function(imageBlob){
             var element, self = this,
@@ -98,7 +97,7 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
             if (save && save.success && save.status === 201) {
                 //
                 if (fileType.indexOf('svg') !== -1) {
-                    element = document.application.njUtils.make('embed', null, this.application.ninja.currentDocument);//TODO: Verify this is proper
+                    element = document.application.njUtils.make('embed', null, this.application.ninja.currentDocument);
                     element.type = 'image/svg+xml';
                     element.src = url+'/'+fileName;
                 } else {
@@ -119,7 +118,7 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
                 //
                 self.application.ninja.elementMediator.addElements(element, rules, false);
             } else {
-                //TODO: HANDLE ERROR ON SAVING FILE TO BE ADDED AS ELEMENT
+                //HANDLE ERROR ON SAVING FILE TO BE ADDED AS ELEMENT
             }
 
             return element;
@@ -127,7 +126,7 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
     },
 
     //paste from external applicaitons
-    pasteHtml:{//todo: change to pasteNinja, pasteHTML, etc
+    pasteHtml:{
         value: function(htmlData, textData){
             var i=0, j=0,
                 pasteDataObject=null,
@@ -141,7 +140,7 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
 
             if(htmlData){
 
-                //TODO: cleanse HTML
+                //cleanse HTML
 
                 htmlData.replace(/[<script]/g," ");
 
diff --git a/js/clipboard/internal-ops/elements-clipboard-agent.js b/js/clipboard/internal-ops/elements-clipboard-agent.js
index 14984593..fa433a59 100644
--- a/js/clipboard/internal-ops/elements-clipboard-agent.js
+++ b/js/clipboard/internal-ops/elements-clipboard-agent.js
@@ -141,7 +141,7 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com
         }
     },
 
-    pasteFromCopy:{//todo: change to appropriate name
+    pasteFromCopy:{
         value:function(){
                 var i=0, j=0,
                 pastedElements = [],//array of te pastes clones - for selection
@@ -151,7 +151,7 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com
 
             this.pasteCounter++;
 
-            //TODO: cleanse HTML
+            //cleanse HTML
 
             for(j=0; j< this.copiedObjects.copy.length; j++){
                 copiedElement = this.copiedObjects.copy[j];
@@ -229,9 +229,6 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com
             //build the computed style attribute
             computedStyles = elem.ownerDocument.defaultView.getComputedStyle(elem);
 
-            //todo: consider cleaning up the position data [or making position:relative with 0,0] from the computed styles,
-            // so that the object is pasted onto expernal applicaitons [like gmail] with no offset
-
             for (i = 0; i < computedStyles.length; i++) {
                 stylePropertyName = computedStyles[i];
                 computedStylesStr = computedStylesStr + stylePropertyName + ":" + computedStyles.getPropertyValue(stylePropertyName) + ";";
diff --git a/js/code-editor/code-editor-wrapper.js b/js/code-editor/code-editor-wrapper.js
index fcf7460a..7c6b1b23 100644
--- a/js/code-editor/code-editor-wrapper.js
+++ b/js/code-editor/code-editor-wrapper.js
@@ -112,7 +112,6 @@ exports.CodeEditorWrapper = Montage.create(Component, {
 
     deserializedFromTemplate: {
         value: function() {
-            //TODO:add logic to check some configuration file to load the right code editor
             this.codeEditor = CodeMirror;
         }
     },
-- 
cgit v1.2.3