diff options
Diffstat (limited to 'js/io/ui')
8 files changed, 120 insertions, 133 deletions
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css index 7f11c225..092ca626 100755 --- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css +++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css | |||
@@ -5,7 +5,7 @@ | |||
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | .newfileLocation .newFileName{ | 7 | .newfileLocation .newFileName{ |
8 | width:70%; | 8 | width:65%; |
9 | margin-left:5px; | 9 | margin-left:5px; |
10 | } | 10 | } |
11 | 11 | ||
@@ -49,7 +49,7 @@ | |||
49 | } | 49 | } |
50 | 50 | ||
51 | .newfileLocation .nameText{ | 51 | .newfileLocation .nameText{ |
52 | margin-right:31px; | 52 | margin-right:28px; |
53 | } | 53 | } |
54 | 54 | ||
55 | .newfileLocation .hottextunit{ | 55 | .newfileLocation .hottextunit{ |
@@ -57,3 +57,6 @@ | |||
57 | display: inline; | 57 | display: inline; |
58 | } | 58 | } |
59 | 59 | ||
60 | .newfileLocation .fileExtension{ | ||
61 | color:#d7d7d7; | ||
62 | } | ||
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html index d7fbc235..8c0327eb 100755 --- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html +++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html | |||
@@ -76,14 +76,18 @@ | |||
76 | <div class="template"></div> | 76 | <div class="template"></div> |
77 | </div> | 77 | </div> |
78 | <div class="locationSelection"> | 78 | <div class="locationSelection"> |
79 | <div><span class="nameText">NAME:</span><input id="newFileName" class="nj-skinned newFileName" type="search" value="" /></div> | 79 | <div> |
80 | <span class="nameText">NAME:</span> | ||
81 | <input id="newFileName" class="nj-skinned newFileName" type="search" value="" /> | ||
82 | <span class="fileExtension"></span> | ||
83 | </div> | ||
80 | <div> | 84 | <div> |
81 | <span>DIRECTORY:</span> | 85 | <span>DIRECTORY:</span> |
82 | <div id="fileInputField"></div> | 86 | <div id="fileInputField"></div> |
83 | </div> | 87 | </div> |
84 | <br /> | 88 | <br /> |
85 | <div><span>WIDTH:</span><span class="templatePx" id="templateWidth"></span></div> | 89 | <div style="display:none;"><span>WIDTH:</span><span class="templatePx" id="templateWidth"></span></div> |
86 | <div><span>HEIGHT:</span><span class="templatePx" id="templateHeight"></span></div> | 90 | <div style="display:none;"><span>HEIGHT:</span><span class="templatePx" id="templateHeight"></span></div> |
87 | </div> | 91 | </div> |
88 | </div> | 92 | </div> |
89 | </body> | 93 | </body> |
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 @@ | |||
153 | border:2px solid #a1a1a1; | 153 | border:2px solid #a1a1a1; |
154 | background-image:none; | 154 | background-image:none; |
155 | cursor:auto; | 155 | cursor:auto; |
156 | } | ||
157 | |||
158 | .newfile .atree ul{ | ||
159 | -webkit-padding-start: 10px; | ||
156 | } \ No newline at end of file | 160 | } \ 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 @@ | |||
70 | <div id="newfile" class="newfile"> | 70 | <div id="newfile" class="newfile"> |
71 | <div class="title">Create New File</div> | 71 | <div class="title">Create New File</div> |
72 | <div class="container left-nav"> | 72 | <div class="container left-nav"> |
73 | <div class="projectTypeHeader"><span>File Type</span></div> | 73 | <div class="projectTypeHeader"><span>Choose Type</span></div> |
74 | <div id="projectTypeTree" class="projectTypeTree"></div> | 74 | <div id="projectTypeTree" class="projectTypeTree"></div> |
75 | </div> | 75 | </div> |
76 | <div class="container right-nav"> | 76 | <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 3a2e3e96..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 | |||
@@ -9,7 +9,6 @@ var Montage = require("montage/core/core").Montage, | |||
9 | iconsListModule = require("js/components/ui/icon-list-basic/iconsList.reel"), | 9 | iconsListModule = require("js/components/ui/icon-list-basic/iconsList.reel"), |
10 | treeModule = require("js/components/ui/tree-basic/tree.reel"), | 10 | treeModule = require("js/components/ui/tree-basic/tree.reel"), |
11 | newFileLocationSelectionModule = require("js/io/ui/new-file-dialog/new-file-workflow-controller"); | 11 | newFileLocationSelectionModule = require("js/io/ui/new-file-dialog/new-file-workflow-controller"); |
12 | //nj= ("js/lib/NJUtils.js").NJUtils; | ||
13 | 12 | ||
14 | var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(Component, { | 13 | var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(Component, { |
15 | 14 | ||
@@ -92,6 +91,14 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C | |||
92 | 91 | ||
93 | this.selectedProjectType = {"uri":this.newFileModel.defaultProjectType, "element":null}; | 92 | this.selectedProjectType = {"uri":this.newFileModel.defaultProjectType, "element":null}; |
94 | } | 93 | } |
94 | |||
95 | //update file Extension | ||
96 | if(!!this.newFileModel.projectTypeData[this.newFileModel.defaultProjectType].fileExtension){ | ||
97 | var fileExtensionEl = this.element.querySelector(".fileExtension"); | ||
98 | if(!!fileExtensionEl){ | ||
99 | fileExtensionEl.innerHTML = ""+this.newFileModel.projectTypeData[this.newFileModel.defaultProjectType].fileExtension; | ||
100 | } | ||
101 | } | ||
95 | } | 102 | } |
96 | 103 | ||
97 | }, | 104 | }, |
@@ -128,7 +135,15 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C | |||
128 | 135 | ||
129 | //clear current template selection | 136 | //clear current template selection |
130 | if((!!this.selectedTemplate) && (this.selectedTemplate.element.classList.contains("selected"))){ | 137 | if((!!this.selectedTemplate) && (this.selectedTemplate.element.classList.contains("selected"))){ |
131 | this.selectedTemplate.element.classList.remove("selected"); | 138 | this.selectedTemplate.element.classList.remove("selected"); |
139 | } | ||
140 | |||
141 | //update file Extension | ||
142 | if(!!this.newFileModel.projectTypeData[evt.uri].fileExtension){ | ||
143 | var fileExtensionEl = this.element.querySelector(".fileExtension"); | ||
144 | if(!!fileExtensionEl){ | ||
145 | fileExtensionEl.innerHTML = ""+this.newFileModel.projectTypeData[evt.uri].fileExtension; | ||
146 | } | ||
132 | } | 147 | } |
133 | 148 | ||
134 | //disable ok | 149 | //disable ok |
@@ -186,6 +201,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C | |||
186 | projectWidth = this.newFileLocation.templateWidth, | 201 | projectWidth = this.newFileLocation.templateWidth, |
187 | projectHeight = this.newFileLocation.templateHeight, | 202 | projectHeight = this.newFileLocation.templateHeight, |
188 | 203 | ||
204 | newFilePath = "", fileExtension=this.newFileModel.projectTypeData[selectedProjectTypeID].fileExtension, | ||
189 | 205 | ||
190 | selectionlog= "selectedProjectTypeID="+selectedProjectTypeID +"\n"+ | 206 | selectionlog= "selectedProjectTypeID="+selectedProjectTypeID +"\n"+ |
191 | "templateID="+templateID+ "\n"+ | 207 | "templateID="+templateID+ "\n"+ |
@@ -194,29 +210,30 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C | |||
194 | "projectWidth="+projectWidth+"\n"+ | 210 | "projectWidth="+projectWidth+"\n"+ |
195 | "projectHeight="+projectHeight; | 211 | "projectHeight="+projectHeight; |
196 | 212 | ||
213 | |||
214 | if(/[^/\\]$/g.test(projectDirectory)){ | ||
215 | projectDirectory = projectDirectory + "/"; | ||
216 | } | ||
217 | if(!!fileExtension && (projectName.lastIndexOf(fileExtension) !== (projectName.length - fileExtension.length))){ | ||
218 | projectName = projectName+fileExtension; | ||
219 | } | ||
220 | newFilePath = "" + projectDirectory + projectName; | ||
221 | |||
222 | |||
197 | if(!!this.selectedProjectType && !!this.selectedTemplate | 223 | if(!!this.selectedProjectType && !!this.selectedTemplate |
198 | && this.isValidFileName(projectName) && this.isValidUri(projectDirectory) | 224 | && this.isValidFileName(projectName) && this.isValidUri(projectDirectory) |
199 | && !this.checkFileExists(projectName, projectDirectory, this.selectedProjectType) | 225 | && !this.checkFileExists(projectName, projectDirectory, this.selectedProjectType) |
200 | ){ | 226 | ){ |
201 | this.error.innerHTML=""; | 227 | this.error.innerHTML=""; |
202 | console.log("$$$ new file selections: \n" + selectionlog); | 228 | //console.log("$$$ new file selections: \n" + selectionlog); |
203 | if(!!this.newFileModel.callback && !!this.newFileModel.callbackScope){//inform document-controller if save successful | 229 | if(!!this.newFileModel.callback && !!this.newFileModel.callbackScope){//inform document-controller if save successful |
204 | this.newFileModel.callback.call(this.newFileModel.callbackScope, |