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 --- js/io/system/coreioapi.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'js/io/system') diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js index f0ca568f..e448d981 100755 --- a/js/io/system/coreioapi.js +++ b/js/io/system/coreioapi.js @@ -1009,7 +1009,7 @@ exports.CoreIoApi = Montage.create(Component, { * check if the file exists */ checkFileExists:{ - value: function(fileUri, folderUri, fileType){ + value: function(fileName, folderUri, fileType){ var uri = "", response=null, status=true; //prepare absolute uri @@ -1017,9 +1017,11 @@ exports.CoreIoApi = Montage.create(Component, { folderUri = folderUri + "/"; } - //todo:add file extension check if fileType present + if(!!fileType && (fileName.lastIndexOf(fileType) !== (fileName.length - fileType.length))){ + fileName = fileName+fileType; + } - uri = ""+folderUri+fileUri; + uri = ""+folderUri+fileName; response = this.fileExists({"uri":uri}); if(!!response && response.success && (response.status === 204)){ -- 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 --- js/io/system/coreioapi.js | 1 + js/io/system/projectio.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'js/io/system') diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js index 5379cbfc..115fbf64 100755 --- a/js/io/system/coreioapi.js +++ b/js/io/system/coreioapi.js @@ -1064,6 +1064,7 @@ exports.CoreIoApi = Montage.create(Component, { /*** * checks for valid uri pattern * also flags if Windows uri pattern and Unix uri patterns are mixed + * Todo: need to augment when files can be accessed via other protocols like http, ftp, ssh, etc. */ isValidUri:{ value: function(uri){ diff --git a/js/io/system/projectio.js b/js/io/system/projectio.js index ad4cf151..8e3230d7 100755 --- a/js/io/system/projectio.js +++ b/js/io/system/projectio.js @@ -10,7 +10,7 @@ var Montage = require("montage/core/core").Montage, FileIo = require("js/io/system/fileio").FileIo; //////////////////////////////////////////////////////////////////////// // -exports.ProjectIo = = Montage.create(Object.prototype, { +exports.ProjectIo = Montage.create(Object.prototype, { //////////////////////////////////////////////////////////////////// // newProject: { -- cgit v1.2.3