From 0e595c4e11ce9b44eff157de8616ed15fcd5d6fc Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 2 Feb 2012 12:37:29 -0800
Subject: refactoring some file names and locations, change made to maintain
 only one codemirror div.

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../new-file-options-navigator.css                 | 156 +++++++++
 .../new-file-options-navigator.html                |  92 +++++
 .../new-file-options-navigator.js                  | 378 +++++++++++++++++++++
 3 files changed, 626 insertions(+)
 create mode 100755 js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
 create mode 100755 js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
 create mode 100644 js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js

(limited to 'js/io/ui/new-file-dialog/new-file-options-navigator.reel')

diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
new file mode 100755
index 00000000..7ef6d2ce
--- /dev/null
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
@@ -0,0 +1,156 @@
+/* <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> */
+
+.newfile{
+    font-size:12px;
+    width:650px;
+    height:350px;
+    padding-left: 15px;
+    padding-bottom:25px;
+    background-color:#313131;
+    color:#ffffff;
+}
+
+.newfile .title{
+    font-size:14px;
+    height:15px;
+    padding:5px;
+    text-align: center;
+    font-weight: bold;
+    color: #C1C1C1;
+}
+
+.newfile .container{
+    border: 1px groove #000000;
+    overflow: auto;
+    background-color:#5f5f5f;
+}
+
+.newfile .left-nav{
+    float:left;
+    width:27%;
+    height:90%;
+    overflow-x:auto;
+    overflow-y:auto
+}
+
+.newfile .right-nav{
+    float:left;
+    width:70%;
+    height:90%;
+    overflow: hidden;
+}
+
+.newfile .right-top{
+    border: 1px groove #000000;
+    overflow: auto;
+    min-height:150px;
+    height:58%;
+    width:auto;
+    padding:5px;
+}
+
+.newfile .right-bottom{
+    border: 1px groove #000000;
+    overflow: auto;
+    height:42%;
+    padding: 15px;
+}
+
+.newfile .projectTypeHeader{
+    border-bottom:1px solid #000000;
+    padding:5px;
+    text-align: center;
+    font-weight: bold;
+}
+
+.newfile .buttons{
+    float:right;
+    margin-top: 7px;
+}
+
+.newfile .errorMsg{
+    float:left;
+    margin-top: 7px;
+}
+.newfile .errorMsg span{
+    color: #BF3B3B;
+}
+
+.newfile .disable{
+    color:#5f5f5f;
+    cursor:auto;
+}
+
+.newfile .hide{
+    display: none;
+}
+
+.newfile .treeArrow + .name{
+    font-weight: bold;
+}
+
+.newfile .atreeItem .name{
+    padding: 3px;
+}
+
+.newfile .atreeItem .selected{
+    background-color: #3f3f3f;
+}
+
+.newfile .icon .selected{
+    background-color: #7f7f7f;
+}
+
+.newfile .icon{
+    height:90px;
+}
+
+.newfile .icon .iconLabel{
+    margin-top:4px;
+    max-width:90%;
+    white-space: normal;
+    padding-bottom:4px;
+    overflow: visible;
+}
+
+.newfile .icon .iconImg{
+    margin-left:25px;
+}
+
+.newfile .okButton{
+    margin-right:25px;
+    -webkit-box-align: center;
+    text-align: center;
+    cursor: default;
+    padding: 0px 6px 0px;
+    border:2px solid #d1d1d1;
+    background-color: #e1e1e1;
+    box-sizing: border-box;
+    border-radius:10px;
+    background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);
+    cursor:pointer;
+}
+
+.newfile .cancelButton{
+    -webkit-box-align: center;
+    text-align: center;
+    cursor: default;
+    padding: 0px 6px 0px;
+    border:2px solid #d1d1d1;
+    background-color: #e1e1e1;
+    box-sizing: border-box;
+    border-radius:10px;
+    background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);
+    cursor:pointer;
+}
+
+.newfile input[type="button"]:disabled{
+    background-color: #a1a1a1;
+    border:2px solid #a1a1a1;
+    background-image:none;
+    cursor:auto;
+}
\ No newline at end of file
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
new file mode 100755
index 00000000..eb4a8045
--- /dev/null
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
@@ -0,0 +1,92 @@
+<!DOCTYPE HTML>
+<!-- <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> -->
+<html>
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <link rel="stylesheet" type="text/css" href="new-file-options-navigator.css">
+    <script type="text/montage-serialization">
+    {
+        "okButton": {
+            "module": "montage/ui/button.reel",
+            "name": "Button",
+            "properties": {
+                "element": {"#": "okButton"},
+                "identifier": "okButton"
+            },
+            "listeners": [
+                {
+                    "type": "action",
+                    "listener": {"@": "owner"}
+                }
+            ]
+        },
+
+        "cancelButton": {
+            "module": "montage/ui/button.reel",
+            "name": "Button",
+            "properties": {
+                "element": {"#": "cancelButton"},
+                "identifier": "cancelButton"
+            },
+            "listeners": [
+                {
+                    "type": "action",
+                    "listener": {"@": "owner"}
+                }
+            ]
+        },
+
+        "newFileLocation":{
+            "module": "js/io/ui/new-file-dialog/new-file-location.reel",
+            "name": "NewFileLocation",
+            "properties": {
+                "element": {"#": "right-bottom"}
+            }
+        },
+
+        "owner":{
+            "module": "js/io/ui/new-file-dialog/new-file-options-navigator.reel",
+            "name": "NewFileOptionsNavigator",
+            "properties": {
+                "element": {"#": "newfile"},
+                "projectTypeTree": {"#": "projectTypeTree"},
+                "cancelButton": {"#": "cancelButton"},
+                "okButton": {"#": "okButton"},
+                "templateIcons": {"#": "templateIcons"},
+                "templatesContainer": {"#": "right-top"},
+                "locationSelection": {"#": "right-bottom"},
+                "newFileLocation": {"@": "newFileLocation"},
+                "error": {"#": "error"}
+            }
+        }
+    }
+    </script>
+</head>
+<body>
+<div id="newfile" class="newfile">
+    <div class="title">Create New File</div>
+    <div class="container left-nav">
+        <div class="projectTypeHeader"><span>File Type</span></div>
+        <div id="projectTypeTree" class="projectTypeTree"></div>
+    </div>
+    <div class="container right-nav">
+        <div id="right-top" class="right-top">
+            <div id="templateIcons" class="templateIcons" style="display:block;"></div>
+        </div>
+        <div  id="right-bottom" class="right-bottom">
+            <div class="templateIcon">templateIcon</div>
+            <div class="selections">selections</div>
+        </div>
+    </div>
+    <div class="errorMsg"><span id="error" class="error"></span></div>
+    <div class="buttons">
+        <input id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" />
+        <input id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" />
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
new file mode 100644
index 00000000..cee8d4b7
--- /dev/null
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -0,0 +1,378 @@
+/* <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,
+     iconsListModule = require("js/components/ui/icon-list-basic/iconsList.reel"),
+    treeModule = require("js/components/ui/tree-basic/tree.reel"),
+    newFileLocationSelectionModule = require("js/io/ui/new-file-dialog/new-file-workflow-controller"),
+    nj= require("js/lib/NJUtils.js").NJUtils;
+
+var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(Component, {
+
+    newFileModel: {
+        writable: true,
+        enumerable:false,
+        value:null
+    },
+    selectedProjectType:{
+        writable: true,
+        enumerable:false,
+        value:null
+    },
+    selectedTemplate:{
+        writable: true,
+        enumerable:false,
+        value:null
+    },
+    newFileName:{
+        writable:true,
+        enumerable:false,
+        value:""
+    },
+    newFileDirectory:{
+        writable:true,
+        enumerable:false,
+        value:""
+    },
+    templateWidth:{
+        writable:true,
+        enumerable:false,
+        value:"0 px"
+    },
+    templateHeight:{
+        writable:true,
+        enumerable:false,
+        value:"0 px"
+    },
+    willDraw: {
+    	enumerable: false,
+    	value: function() {}
+    },
+    draw: {
+    	enumerable: false,
+    	value: function() {}
+    },
+    didDraw: {
+    	enumerable: false,
+    	value: function() {
+            var that = this;
+
+            this.templateList = null;
+
+            //draw left nav project type tree
+            var tree = treeModule.Tree.create();
+            tree.showIcons = false;
+            tree.expandTreeAfterDraw = true;
+            tree.directoryBold = true;
+            tree.highlightedUri = this.newFileModel.defaultProjectType;
+            tree.treeViewDataObject = this.newFileModel.prepareContents("categories");
+            tree.element = this.projectTypeTree;
+            tree.needsDraw = true;
+
+            //highlight defaultProjectType
+
+            this.addIdentifiers();
+
+            this.element.addEventListener("drawTree", function(evt){that.handleNewFileNavDrawTree(evt);}, false);
+            this.element.addEventListener("selectedItem", function(evt){that.handleNewFileNavSelectedItem(evt);}, false);//for single selection only
+            this.eventManager.addEventListener("newFileDirectorySet", function(evt){that.handleNewFileDirectorySet(evt);}, false);
+            this.eventManager.addEventListener("newFileNameSet", function(evt){that.handleNewFileNameSet(evt);}, false);
+
+            if(!!this.newFileModel.defaultProjectType){
+                var templates = this.newFileModel.prepareContents(this.newFileModel.defaultProjectType);
+                this.templateList = iconsListModule.IconsList.create();
+                this.templateList.iconsViewDataObject = templates;
+                this.templateList.element = this.templateIcons;
+                this.templateList.needsDraw = true;
+
+
+                this.selectedProjectType = {"uri":this.newFileModel.defaultProjectType, "element":null};
+            }
+        }
+
+    },
+
+    /**
+     * Event Listners
+     */
+
+    addIdentifiers:{
+        value: function(){
+            this.element.identifier = "newFileNav";
+        }
+    },
+
+    handleNewFileNavDrawTree:{
+        value: function(evt){
+                //toggle open or close for directory
+                if((evt.uriType === "directory") && (!!evt.subTreeContainer)){
+                    var tree = treeModule.Tree.create();
+                    tree.showIcons = false;
+                    tree.highlightedUri = this.newFileModel.defaultProjectType;
+                    tree.treeViewDataObject = this.newFileModel.prepareContents(evt.uri);
+                    tree.element = evt.subTreeContainer;
+                    tree.needsDraw = true;
+                }
+            }
+    },
+
+    handleNewFileNavSelectedItem:{
+        value: function(evt){
+            var selectionType =  this.newFileModel.projectTypeData[evt.uri].type;
+            if(evt.target.classList.contains("atreeItemContent") && (selectionType === "file")){//populate templates for project type selection
+                this.highlightSelection(evt.target, "projectType", evt.uri);
+
+                //clear current template selection
+                if((!!this.selectedTemplate) && (this.selectedTemplate.element.classList.contains("selected"))){
+                                    this.selectedTemplate.element.classList.remove("selected");
+                }
+
+                //disable ok
+                if(!this.okButton.hasAttribute("disabled")){
+                    this.okButton.setAttribute("disabled", "true");
+                }
+
+                //save project type selection
+                this.selectedProjectType = {"uri":evt.uri, "element":evt.target};
+
+                //render templates
+                var templates = this.newFileModel.prepareContents(evt.uri);
+                if(this.templatesContainer.querySelectorAll(".list").length > 0){
+                    this.templateList.iconsViewDataObject = templates;
+                }else{
+                    this.templateList = iconsListModule.IconsList.create();
+                    this.templateList.iconsViewDataObject = templates;
+                    this.templateList.element = this.templateIcons;
+                    this.templateList.needsDraw = true;
+                }
+
+
+            }
+
+            if(evt.target.classList.contains("icon")){
+                this.highlightSelection(evt.target, "template", evt.uri);
+
+                //save template selection
+                this.selectedTemplate = {"uri":evt.uri, "element":evt.target};
+
+                this.enableOk();
+
+            }
+        }
+    },
+
+    handleCancelButtonAction :{
+        value:function(evt){
+                //clean up memory
+                this.cleanup();
+
+                if(this.popup){
+                    this.popup.hide();
+                }
+
+            }
+    },
+
+    handleOkButtonAction:{
+        value: function(evt){
+            var selectedProjectTypeID = this.selectedProjectType.uri,
+                templateID = this.selectedTemplate.uri,
+                projectName = this.newFileLocation.newFileName.value,
+                projectDirectory = this.newFileLocation.fileInputField.newFileDirectory.value,
+                projectWidth = this.newFileLocation.templateWidth,
+                projectHeight = this.newFileLocation.templateHeight,
+
+
+                selectionlog= "selectedProjectTypeID="+selectedProjectTypeID +"\n"+
+                            "templateID="+templateID+ "\n"+
+                            "projectName="+projectName+"\n"+
+                            "projectDirectory="+projectDirectory+"\n"+
+                            "projectWidth="+projectWidth+"\n"+
+                            "projectHeight="+projectHeight;
+
+            if(!!this.selectedProjectType && !!this.selectedTemplate
+                && this.isValidFileName(projectName) && this.isValidUri(projectDirectory)
+                && !this.checkFileExists(projectName, projectDirectory, this.selectedProjectType)
+            ){
+                this.error.innerHTML="";
+                console.log("$$$ new file selections: \n" + selectionlog);
+                if(!!this.newFileModel.callback && !!this.newFileModel.callbackScope){//inform document-controller if save successful
+                    this.newFileModel.callback.call(this.newFileModel.callbackScope, {"selectedProjectTypeID":selectedProjectTypeID,
+                                                                                 "templateID":templateID,
+                                                                                 "projectName": projectName,
+                                                                                 "projectDirectory":projectDirectory,
+                                                                                 "projectWidth":projectWidth,
+                                                                                 "projectHeight":projectHeight});//document-controller api
+                }else{
+                    //send selection event
+                    var newFileSelectionEvent = document.createEvent("Events");
+                    newFileSelectionEvent.initEvent("createNewFile", false, false);
+                    newFileSelectionEvent.newFileOptions = {"selectedProjectTypeID":selectedProjectTypeID,
+                                                             "templateID":templateID,
+                                                             "projectName": projectName,
+                                                             "projectDirectory":projectDirectory,
+                                                             "projectWidth":projectWidth,
+                                                             "projectHeight":projectHeight};
+                    this.eventManager.dispatchEvent(newFileSelectionEvent);
+                }
+                //store last selected project type
+                var dataStore = window.sessionStorage;
+                try {
+                    dataStore.setItem('lastSelectedProjectType',escape(""+selectedProjectTypeID));
+                }
+                catch(e){
+                    if(e.code == 22){
+                        dataStore.clear();
+                    }
+                }
+
+                this.cleanup();//clear up any unnecessary memory
+
+                if(this.popup){
+                    this.popup.hide();
+                }
+            }else{
+                if(this.error.innerHTML !== ""){
+                    this.showError("! Project Template, Name and Directory should be valid.");
+                }
+                //disable ok
+                if(!this.okButton.hasAttribute("disabled")){
+                    this.okButton.setAttribute("disabled", "true");
+                }
+            }
+        }
+    },
+
+    handleNewFileDirectorySet:{
+        value:function(evt){
+            if(!!evt._event.newFileDirectory){
+                this.newFileDirectory = evt._event.newFileDirectory;
+                if(this.isValidUri(this.newFileDirectory)){
+                    this.enableOk();
+                }
+            }
+        }
+    },
+
+    handleNewFileNameSet:{
+        value:function(evt){
+            if(!!evt._event.newFileName){
+                this.newFileName = evt._event.newFileName;
+                if(this.isValidFileName(this.newFileName)){
+                    this.enableOk();
+                }
+            }
+        }
+    },
+
+    highlightSelection:{
+        value: function(el, selectionType, uri){
+            var elem;
+            //clear previous selection
+            if(selectionType === "projectType"){
+                if((!!this.selectedProjectType) && (uri !== this.selectedProjectType.uri)){
+                    if(!!this.selectedProjectType.element){
+                        this.selectedProjectType.element.classList.remove("selected");
+                    }else{
+                        //find the selected element
+                        elem = document.querySelector(".projectTypeTree").querySelector(".selected");
+                        if(!!elem){
+                            elem.classList.remove("selected");
+                        }
+                    }
+                    el.classList.add("selected");
+                }else if(this.selectedProjectType === null){
+                    el.classList.add("selected");
+                }
+            }else if(selectionType === "template"){
+                if((!!this.selectedTemplate) && (uri !== this.selectedTemplate.element)){
+                    if(!!this.selectedTemplate.element){this.selectedTemplate.element.classList.remove("selected");}
+                    el.classList.add("selected");
+                }else if(this.selectedTemplate === null){
+                    el.classList.add("selected");
+                }
+            }
+
+        }
+    },
+
+    enableOk:{
+        value: function(){
+            var status = false;
+
+            if(!!this.selectedProjectType && !!this.selectedTemplate
+                && this.isValidFileName(this.newFileName) && this.isValidUri(this.newFileDirectory)
+                && !this.checkFileExists(this.newFileName, this.newFileDirectory, this.selectedProjectType)
+                ){
+                status = true;
+                this.okButton.removeAttribute("disabled");
+                this.error.innerHTML="";
+            }
+            return status;
+        }
+    },
+
+    cleanup:{
+        value:function(){
+            var that = this;
+
+            this.newFileName = "";
+            this.newFileDirectory = "";
+            this.selectedProjectType = null;
+            this.selectedTemplate = null;
+
+            //remove event listeners
+            this.element.removeEventListener("drawTree", function(evt){that.handleNewFileNavDrawTree(evt);}, false);
+            this.element.removeEventListener("selectedItem", function(evt){that.handleNewFileNavSelectedItem(evt);}, false);//for single selection only
+            this.eventManager.removeEventListener("newFileDirectorySet", function(evt){that.handleNewFileDirectorySet(evt);}, false);
+            this.eventManager.removeEventListener("newFileNameSet", function(evt){that.handleNewFileNameSet(evt);}, false);
+        }
+    },
+
+    isValidUri:{
+        value: function(uri){
+            var status= nj.isValidUri(uri);
+            if(uri !== ""){
+                if(!status){
+                    this.showError("! Invalid directory.");
+                }
+            }
+            return status;
+        }
+    },
+    isValidFileName:{
+        value: function(fileName){
+            var status = nj.isValidFileName(fileName);
+            if(fileName !== ""){
+                if(!status){
+                    this.showError("! Invalid file name.");
+                }
+            }
+            return status;
+        }
+    },
+    checkFileExists:{
+        value: function(fileUri, folderUri, fileType){
+            var status= this.application.ninja.coreIoApi.checkFileExists(fileUri, folderUri, fileType);
+            if(status){
+                this.showError("! File already exists.");
+            }
+            return status;
+        }
+    },
+    showError:{
+        value:function(errorString){
+            this.error.innerHTML = "";
+            this.error.innerHTML=errorString;
+            //disable ok
+            if(!this.okButton.hasAttribute("disabled")){
+                this.okButton.setAttribute("disabled", "true");
+            }
+        }
+    }
+
+});
\ No newline at end of file
-- 
cgit v1.2.3


From 476a25e8a662270dfe5b37c560e4235f02b146e4 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 2 Feb 2012 12:59:41 -0800
Subject: uri validation moved to file io apis

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../new-file-options-navigator.reel/new-file-options-navigator.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/io/ui/new-file-dialog/new-file-options-navigator.reel')

diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
index cee8d4b7..a747b8de 100644
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -335,7 +335,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
     isValidUri:{
         value: function(uri){
-            var status= nj.isValidUri(uri);
+            var status= this.application.ninja.coreIoApi.isValidUri(uri);
             if(uri !== ""){
                 if(!status){
                     this.showError("! Invalid directory.");
-- 
cgit v1.2.3


From 6890662caba94598675679f40dbb725301c93e98 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 2 Feb 2012 17:45:22 -0800
Subject: integrated new file dialog with the template descriptor.json and
 document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../new-file-options-navigator.css                 |  4 ++
 .../new-file-options-navigator.html                |  2 +-
 .../new-file-options-navigator.js                  | 48 +++++++++++++++-------
 3 files changed, 38 insertions(+), 16 deletions(-)

(limited to 'js/io/ui/new-file-dialog/new-file-options-navigator.reel')

diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
index 7ef6d2ce..95ce01f9 100755
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
@@ -153,4 +153,8 @@
     border:2px solid #a1a1a1;
     background-image:none;
     cursor:auto;
+}
+
+.newfile .atree ul{
+    -webkit-padding-start: 10px;
 }
\ No newline at end of file
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
index eb4a8045..c9178d65 100755
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
@@ -70,7 +70,7 @@
 <div id="newfile" class="newfile">
     <div class="title">Create New File</div>
     <div class="container left-nav">
-        <div class="projectTypeHeader"><span>File Type</span></div>
+        <div class="projectTypeHeader"><span>Choose Type</span></div>
         <div id="projectTypeTree" class="projectTypeTree"></div>
     </div>
     <div class="container right-nav">
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
index a747b8de..467c5452 100644
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -92,6 +92,14 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
                 this.selectedProjectType = {"uri":this.newFileModel.defaultProjectType, "element":null};
             }
+
+            //update file Extension
+            if(!!this.newFileModel.projectTypeData[this.newFileModel.defaultProjectType].fileExtension){
+                var fileExtensionEl = this.element.querySelector(".fileExtension");
+                if(!!fileExtensionEl){
+                    fileExtensionEl.innerHTML = ""+this.newFileModel.projectTypeData[this.newFileModel.defaultProjectType].fileExtension;
+                }
+            }
         }
 
     },
@@ -128,7 +136,15 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
                 //clear current template selection
                 if((!!this.selectedTemplate) && (this.selectedTemplate.element.classList.contains("selected"))){
-                                    this.selectedTemplate.element.classList.remove("selected");
+                    this.selectedTemplate.element.classList.remove("selected");
+                }
+
+                //update file Extension
+                if(!!this.newFileModel.projectTypeData[evt.uri].fileExtension){
+                    var fileExtensionEl = this.element.querySelector(".fileExtension");
+                    if(!!fileExtensionEl){
+                        fileExtensionEl.innerHTML = ""+this.newFileModel.projectTypeData[evt.uri].fileExtension;
+                    }
                 }
 
                 //disable ok
@@ -186,6 +202,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                 projectWidth = this.newFileLocation.templateWidth,
                 projectHeight = this.newFileLocation.templateHeight,
 
+                newFilePath = "", fileExtension=this.newFileModel.projectTypeData[selectedProjectTypeID].fileExtension,
 
                 selectionlog= "selectedProjectTypeID="+selectedProjectTypeID +"\n"+
                             "templateID="+templateID+ "\n"+
@@ -194,29 +211,30 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                             "projectWidth="+projectWidth+"\n"+
                             "projectHeight="+projectHeight;
 
+
+            if(/[^/\\]$/g.test(projectDirectory)){
+                projectDirectory = projectDirectory + "/";
+            }
+            if(!!fileExtension && (projectName.lastIndexOf(fileExtension) !== (projectName.length - fileExtension.length))){
+                projectName = projectName+fileExtension;
+            }
+            newFilePath = "" + projectDirectory + projectName;
+
+
             if(!!this.selectedProjectType && !!this.selectedTemplate
                 && this.isValidFileName(projectName) && this.isValidUri(projectDirectory)
                 && !this.checkFileExists(projectName, projectDirectory, this.selectedProjectType)
             ){
                 this.error.innerHTML="";
-                console.log("$$$ new file selections: \n" + selectionlog);
+                //console.log("$$$ new file selections: \n" + selectionlog);
                 if(!!this.newFileModel.callback && !!this.newFileModel.callbackScope){//inform document-controller if save successful
-                    this.newFileModel.callback.call(this.newFileModel.callbackScope, {"selectedProjectTypeID":selectedProjectTypeID,
-                                                                                 "templateID":templateID,
-                                                                                 "projectName": projectName,
-                                                                                 "projectDirectory":projectDirectory,
-                                                                                 "projectWidth":projectWidth,
-                                                                                 "projectHeight":projectHeight});//document-controller api
+                    this.newFileModel.callback.call(this.newFileModel.callbackScope, {"fileTemplateUri":selectedProjectTypeID,
+                                                                                 "newFilePath":newFilePath});//document-controller api
                 }else{
                     //send selection event
                     var newFileSelectionEvent = document.createEvent("Events");
                     newFileSelectionEvent.initEvent("createNewFile", false, false);
-                    newFileSelectionEvent.newFileOptions = {"selectedProjectTypeID":selectedProjectTypeID,
-                                                             "templateID":templateID,
-                                                             "projectName": projectName,
-                                                             "projectDirectory":projectDirectory,
-                                                             "projectWidth":projectWidth,
-                                                             "projectHeight":projectHeight};
+                    newFileSelectionEvent.newFileOptions = {"fileTemplateUri":selectedProjectTypeID, "newFilePath":newFilePath};
                     this.eventManager.dispatchEvent(newFileSelectionEvent);
                 }
                 //store last selected project type
@@ -306,7 +324,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
             if(!!this.selectedProjectType && !!this.selectedTemplate
                 && this.isValidFileName(this.newFileName) && this.isValidUri(this.newFileDirectory)
-                && !this.checkFileExists(this.newFileName, this.newFileDirectory, this.selectedProjectType)
+                && !this.checkFileExists(this.newFileName, this.newFileDirectory, this.newFileModel.projectTypeData[this.selectedProjectType.uri].fileExtension)
                 ){
                 status = true;
                 this.okButton.removeAttribute("disabled");
-- 
cgit v1.2.3


From 79b0173eeca079dec42ff1480182656dbe3af44f Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 3 Feb 2012 09:49:23 -0800
Subject: removed usage of NJUtils.js as it is being deleted.

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../new-file-options-navigator.js                  | 24 ++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'js/io/ui/new-file-dialog/new-file-options-navigator.reel')

diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
index 467c5452..f17b15d5 100644
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -8,8 +8,7 @@ var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component,
      iconsListModule = require("js/components/ui/icon-list-basic/iconsList.reel"),
     treeModule = require("js/components/ui/tree-basic/tree.reel"),
-    newFileLocationSelectionModule = require("js/io/ui/new-file-dialog/new-file-workflow-controller"),
-    nj= require("js/lib/NJUtils.js").NJUtils;
+    newFileLocationSelectionModule = require("js/io/ui/new-file-dialog/new-file-workflow-controller");
 
 var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(Component, {
 
@@ -364,7 +363,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
     },
     isValidFileName:{
         value: function(fileName){
-            var status = nj.isValidFileName(fileName);
+            var status = this.isValidFileName(fileName);
             if(fileName !== ""){
                 if(!status){
                     this.showError("! Invalid file name.");
@@ -391,6 +390,23 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                 this.okButton.setAttribute("disabled", "true");
             }
         }
-    }
+    },
+
+        /***
+         * file name validation
+         */
+        isValidFileName:{
+            value: function(fileName){
+                var status = false;
+                if(fileName !== ""){
+                    fileName = fileName.replace(/^\s+|\s+$/g,"");
+                    status = !(/[/\\]/g.test(fileName));
+                    if(status && navigator.userAgent.indexOf("Macintosh") != -1){//for Mac files beginning with . are hidden
+                        status = !(/^\./g.test(fileName));
+                    }
+                }
+                return status;
+            }
+        }
 
 });
\ No newline at end of file
-- 
cgit v1.2.3


From 7618cabe1945acc6392c48f3b57820f67f7973b0 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 3 Feb 2012 10:22:26 -0800
Subject: removed using montage button, since it has changed in Montafe 0.6

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../new-file-options-navigator.html                | 30 ----------------------
 .../new-file-options-navigator.js                  |  3 +++
 2 files changed, 3 insertions(+), 30 deletions(-)

(limited to 'js/io/ui/new-file-dialog/new-file-options-navigator.reel')

diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
index c9178d65..58bbed30 100755
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
@@ -10,36 +10,6 @@
     <link rel="stylesheet" type="text/css" href="new-file-options-navigator.css">
     <script type="text/montage-serialization">
     {
-        "okButton": {
-            "module": "montage/ui/button.reel",
-            "name": "Button",
-            "properties": {
-                "element": {"#": "okButton"},
-                "identifier": "okButton"
-            },
-            "listeners": [
-                {
-                    "type": "action",
-                    "listener": {"@": "owner"}
-                }
-            ]
-        },
-
-        "cancelButton": {
-            "module": "montage/ui/button.reel",
-            "name": "Button",
-            "properties": {
-                "element": {"#": "cancelButton"},
-                "identifier": "cancelButton"
-            },
-            "listeners": [
-                {
-                    "type": "action",
-                    "listener": {"@": "owner"}
-                }
-            ]
-        },
-
         "newFileLocation":{
             "module": "js/io/ui/new-file-dialog/new-file-location.reel",
             "name": "NewFileLocation",
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
index f17b15d5..6f8a9ee7 100644
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -81,6 +81,9 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
             this.eventManager.addEventListener("newFileDirectorySet", function(evt){that.handleNewFileDirectorySet(evt);}, false);
             this.eventManager.addEventListener("newFileNameSet", function(evt){that.handleNewFileNameSet(evt);}, false);
 
+            this.okButton.addEventListener("click", function(evt){that.handleOkButtonAction(evt);}, false);
+            this.cancelButton.addEventListener("click", function(evt){that.handleCancelButtonAction(evt);}, false);
+
             if(!!this.newFileModel.defaultProjectType){
                 var templates = this.newFileModel.prepareContents(this.newFileModel.defaultProjectType);
                 this.templateList = iconsListModule.IconsList.create();
-- 
cgit v1.2.3


From 1daf146c849a0a8dbd2b61b14218c9a39bdee3a7 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 3 Feb 2012 17:22:48 -0800
Subject: added editor tab save while switching code view tabs, integrated new
 file dialog with io mediator to open the new file in a new tab

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../new-file-options-navigator.reel/new-file-options-navigator.js    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'js/io/ui/new-file-dialog/new-file-options-navigator.reel')

diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
index 6f8a9ee7..2f148621 100644
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -231,12 +231,13 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                 //console.log("$$$ new file selections: \n" + selectionlog);
                 if(!!this.newFileModel.callback && !!this.newFileModel.callbackScope){//inform document-controller if save successful
                     this.newFileModel.callback.call(this.newFileModel.callbackScope, {"fileTemplateUri":selectedProjectTypeID,
-                                                                                 "newFilePath":newFilePath});//document-controller api
+                                                                                 "newFilePath":newFilePath,
+                                                                                  "fileExtension":fileExtension});//document-controller api
                 }else{
                     //send selection event
                     var newFileSelectionEvent = document.createEvent("Events");
                     newFileSelectionEvent.initEvent("createNewFile", false, false);
-                    newFileSelectionEvent.newFileOptions = {"fileTemplateUri":selectedProjectTypeID, "newFilePath":newFilePath};
+                    newFileSelectionEvent.newFileOptions = {"fileTemplateUri":selectedProjectTypeID, "newFilePath":newFilePath,"fileExtension":fileExtension};
                     this.eventManager.dispatchEvent(newFileSelectionEvent);
                 }
                 //store last selected project type
-- 
cgit v1.2.3


From c9d0cb73698066247c6267bba8fa446a979565fb Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 9 Feb 2012 11:12:21 -0800
Subject: fixed templates descriptor, changed validation to on key up, fixed
 minor ui issues

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../new-file-options-navigator.js                                | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'js/io/ui/new-file-dialog/new-file-options-navigator.reel')

diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
index 2f148621..bcb9d123 100644
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -217,8 +217,9 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
             if(/[^/\\]$/g.test(projectDirectory)){
                 projectDirectory = projectDirectory + "/";
             }
-            if(!!fileExtension && (projectName.lastIndexOf(fileExtension) !== (projectName.length - fileExtension.length))){
-                projectName = projectName+fileExtension;
+
+            if(!!fileExtension && ((projectName.lastIndexOf(fileExtension) === -1) || (projectName.lastIndexOf(fileExtension) !== (projectName.length - fileExtension.length)))){
+                projectName = projectName+fileExtension;//append file extension if file extension is already not present or is actually part of the file name
             }
             newFilePath = "" + projectDirectory + projectName;
 
@@ -367,7 +368,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
     },
     isValidFileName:{
         value: function(fileName){
-            var status = this.isValidFileName(fileName);
+            var status = this.validateFileName(fileName);
             if(fileName !== ""){
                 if(!status){
                     this.showError("! Invalid file name.");
@@ -399,7 +400,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
         /***
          * file name validation
          */
-        isValidFileName:{
+        validateFileName:{
             value: function(fileName){
                 var status = false;
                 if(fileName !== ""){
-- 
cgit v1.2.3


From ad0ee69be3512325ede94738f23597086a141a3e Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 10 Feb 2012 01:55:30 -0800
Subject: file open and file new integrated again

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../new-file-options-navigator.reel/new-file-options-navigator.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'js/io/ui/new-file-dialog/new-file-options-navigator.reel')

diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
index bcb9d123..f514b81a 100644
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -230,10 +230,10 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
             ){
                 this.error.innerHTML="";
                 //console.log("$$$ new file selections: \n" + selectionlog);
-                if(!!this.newFileModel.callback && !!this.newFileModel.callbackScope){//inform document-controller if save successful
-                    this.newFileModel.callback.call(this.newFileModel.callbackScope, {"fileTemplateUri":selectedProjectTypeID,
-                                                                                 "newFilePath":newFilePath,
-                                                                                  "fileExtension":fileExtension});//document-controller api
+                if(!!this.newFileModel.callback){//inform document-controller if save successful
+                    this.newFileModel.callback({"fileTemplateUri":selectedProjectTypeID,
+                                                 "newFilePath":newFilePath,
+                                                  "fileExtension":fileExtension});//document-controller api
                 }else{
                     //send selection event
                     var newFileSelectionEvent = document.createEvent("Events");
-- 
cgit v1.2.3


From c627ebb5735d55218813b073c655dae6cded6040 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 10 Feb 2012 15:50:14 -0800
Subject: show iframeContainer if all documents are closed

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../new-file-options-navigator.reel/new-file-options-navigator.js    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'js/io/ui/new-file-dialog/new-file-options-navigator.reel')

diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
index f514b81a..848e0cb8 100644
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -226,7 +226,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
             if(!!this.selectedProjectType && !!this.selectedTemplate
                 && this.isValidFileName(projectName) && this.isValidUri(projectDirectory)
-                && !this.checkFileExists(projectName, projectDirectory, this.selectedProjectType)
+                && !this.checkFileExists(projectName, projectDirectory, fileExtension)
             ){
                 this.error.innerHTML="";
                 //console.log("$$$ new file selections: \n" + selectionlog);
@@ -258,7 +258,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                     this.popup.hide();
                 }
             }else{
-                if(this.error.innerHTML !== ""){
+                if(this.error.innerHTML === ""){
                     this.showError("! Project Template, Name and Directory should be valid.");
                 }
                 //disable ok
@@ -328,7 +328,6 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
             if(!!this.selectedProjectType && !!this.selectedTemplate
                 && this.isValidFileName(this.newFileName) && this.isValidUri(this.newFileDirectory)
-                && !this.checkFileExists(this.newFileName, this.newFileDirectory, this.newFileModel.projectTypeData[this.selectedProjectType.uri].fileExtension)
                 ){
                 status = true;
                 this.okButton.removeAttribute("disabled");
-- 
cgit v1.2.3


From 50a40c4e21b9a4d53d6d1fb739d838c0319ab09b Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 13 Feb 2012 19:55:46 -0800
Subject: new file dialog - preselect default template

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../new-file-options-navigator.js                                | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'js/io/ui/new-file-dialog/new-file-options-navigator.reel')

diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
index 848e0cb8..f5ab0027 100644
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -88,6 +88,9 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                 var templates = this.newFileModel.prepareContents(this.newFileModel.defaultProjectType);
                 this.templateList = iconsListModule.IconsList.create();
                 this.templateList.iconsViewDataObject = templates;
+                if(templates.length >0){
+                    this.templateList.selected = templates[0].uri;
+                }
                 this.templateList.element = this.templateIcons;
                 this.templateList.needsDraw = true;
 
@@ -161,9 +164,15 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                 var templates = this.newFileModel.prepareContents(evt.uri);
                 if(this.templatesContainer.querySelectorAll(".list").length > 0){
                     this.templateList.iconsViewDataObject = templates;
+                    if(templates.length >0){
+                        this.templateList.selected = templates[0].uri;
+                    }
                 }else{
                     this.templateList = iconsListModule.IconsList.create();
                     this.templateList.iconsViewDataObject = templates;
+                    if(templates.length >0){
+                        this.templateList.selected = templates[0].uri;
+                    }
                     this.templateList.element = this.templateIcons;
                     this.templateList.needsDraw = true;
                 }
-- 
cgit v1.2.3


From 5b6c62b7164cbde2845a3f7af810568e5ba53a6a Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 13 Feb 2012 22:39:28 -0800
Subject: File IO UI tweaks

Making minor tweaks to the UI for file IO, will need to make much more at a later time.
---
 .../new-file-options-navigator.css                 | 52 +++++++++++++++++-----
 .../new-file-options-navigator.html                |  4 +-
 2 files changed, 42 insertions(+), 14 deletions(-)

(limited to 'js/io/ui/new-file-dialog/new-file-options-navigator.reel')

diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
index 95ce01f9..5a359200 100755
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
@@ -9,9 +9,12 @@
     width:650px;
     height:350px;
     padding-left: 15px;
-    padding-bottom:25px;
-    background-color:#313131;
+    padding-bottom:32px;
+    background-color:#494949;
     color:#ffffff;
+    font-family: 'Droid Sans', sans-serif;
+    border-radius: 8px;
+	box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
 }
 
 .newfile .title{
@@ -19,12 +22,14 @@
     height:15px;
     padding:5px;
     text-align: center;
-    font-weight: bold;
-    color: #C1C1C1;
+    text-transform: uppercase;
+	font-weight: normal;
+  	text-shadow: 1px 1px 1px #000;
 }
 
 .newfile .container{
-    border: 1px groove #000000;
+    border: 1px solid #000000;
+    border-right: none;
     overflow: auto;
     background-color:#5f5f5f;
 }
@@ -45,7 +50,7 @@
 }
 
 .newfile .right-top{
-    border: 1px groove #000000;
+    border-right: 1px solid #000000;
     overflow: auto;
     min-height:150px;
     height:58%;
@@ -54,7 +59,8 @@
 }
 
 .newfile .right-bottom{
-    border: 1px groove #000000;
+    border: 1px solid #000000;
+  	border-left: none;
     overflow: auto;
     height:42%;
     padding: 15px;
@@ -64,7 +70,9 @@
     border-bottom:1px solid #000000;
     padding:5px;
     text-align: center;
-    font-weight: bold;
+    text-transform: uppercase;
+	font-weight: normal;
+  	text-shadow: 1px 1px 1px #000;
 }
 
 .newfile .buttons{
@@ -74,10 +82,14 @@
 
 .newfile .errorMsg{
     float:left;
-    margin-top: 7px;
+    margin-top: 12px;
+    text-shadow: 1px 1px 1px #333;
+    text-transform: uppercase;
+    clear: left;
+    width: 200px;
 }
 .newfile .errorMsg span{
-    color: #BF3B3B;
+    color: #FF3A3A;
 }
 
 .newfile .disable{
@@ -93,6 +105,10 @@
     font-weight: bold;
 }
 
+.newfile .atreeItem {
+	text-shadow: 1px 1px 1px #000;
+}
+
 .newfile .atreeItem .name{
     padding: 3px;
 }
@@ -115,14 +131,23 @@
     white-space: normal;
     padding-bottom:4px;
     overflow: visible;
+    text-shadow: 1px 1px 1px #000;
 }
 
 .newfile .icon .iconImg{
     margin-left:25px;
 }
 
+.newfile .buttons button {
+	float: left;
+	width: 100px;
+	margin-top: 3px;
+}
+
 .newfile .okButton{
-    margin-right:25px;
+	margin: 0px 18px 0px 8px; 
+    /*
+margin-right:25px;
     -webkit-box-align: center;
     text-align: center;
     cursor: default;
@@ -133,10 +158,12 @@
     border-radius:10px;
     background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);
     cursor:pointer;
+*/
 }
 
 .newfile .cancelButton{
-    -webkit-box-align: center;
+    /*
+-webkit-box-align: center;
     text-align: center;
     cursor: default;
     padding: 0px 6px 0px;
@@ -146,6 +173,7 @@
     border-radius:10px;
     background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);
     cursor:pointer;
+*/
 }
 
 .newfile input[type="button"]:disabled{
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
index 58bbed30..d4043658 100755
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
@@ -54,8 +54,8 @@
     </div>
     <div class="errorMsg"><span id="error" class="error"></span></div>
     <div class="buttons">
-        <input id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" />
-        <input id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" />
+        <button id="cancelButton" value="CANCEL" class="nj-skinned cancelButton">Cancel</button>
+        <button id="okButton" value="OK" disabled="true" class="nj-skinned okButton">Ok</button>
     </div>
 </div>
 </body>
-- 
cgit v1.2.3


From 4641dbefb6e8cb41f1f3d7f4d070d50bcaed94be Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 16 Feb 2012 17:32:57 -0800
Subject: remove similar function from coreioapi.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../new-file-options-navigator.js                   | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'js/io/ui/new-file-dialog/new-file-options-navigator.reel')

diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
index f5ab0027..11b322fe 100644
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -386,8 +386,25 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
         }
     },
     checkFileExists:{
-        value: function(fileUri, folderUri, fileType){
-            var status= this.application.ninja.coreIoApi.checkFileExists(fileUri, folderUri, fileType);
+        value: function(fileName, folderUri, fileType){
+            var uri = "", response=null, status=true;
+            //prepare absolute uri
+            if(/[^/\\]$/g.test(folderUri)){
+                folderUri = folderUri + "/";
+            }
+            if(!!fileType && (fileName.lastIndexOf(fileType) !== (fileName.length - fileType.length))){
+                fileName = fileName+fileType;
+            }
+            uri = ""+folderUri+fileName;
+            response= this.application.ninja.coreIoApi.fileExists({"uri":uri});
+            if(!!response && response.success && (response.status === 204)){
+                status = true;
+            }else if(!!response && response.success && (response.status === 404)){
+                status = false;
+            }else{
+                status = false;
+            }
+
             if(status){
                 this.showError("! File already exists.");
             }
-- 
cgit v1.2.3