Merge pull request #1813 from jdiehl/bugfixes-from-in-browser

jasonsanjose · jasonsanjose · commit 36a8a0356c22 · 2012-10-11T10:57:06.000-07:00
Here are the bugfixes from the in-browser branch
diff --git a/src/command/KeyBindingManager.js b/src/command/KeyBindingManager.js
@@ -483,6 +483,7 @@ define(function (require, exports, module) {
             function (event) {
                 if (handleKey(_translateKeyboardEvent(event))) {
                     event.stopPropagation();
+                    event.preventDefault();
                 }
             },
             true
diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js
@@ -343,12 +343,7 @@ define(function (require, exports, module) {
         var createWithSuggestedName = function (suggestedName) {
             ProjectManager.createNewItem(baseDir, suggestedName, false, isFolder)
                 .pipe(deferred.resolve, deferred.reject, deferred.notify)
-                .always(function () { fileNewInProgress = false; })
-                .done(function (entry) {
-                    if (!isFolder) {
-                        FileViewController.addToWorkingSetAndSelect(entry.fullPath, FileViewController.PROJECT_MANAGER);
-                    }
-                });
+                .always(function () { fileNewInProgress = false; });
         };
 
         deferred.done(createWithSuggestedName);
diff --git a/src/file/FileUtils.js b/src/file/FileUtils.js
@@ -241,8 +241,7 @@ define(function (require, exports, module) {
         if (module && module.uri) {
 
             // Remove window name from base path. Maintain trailing slash.
-            pathname = decodeURI(window.location.pathname);
-            path = convertToNativePath(pathname.substr(0, pathname.lastIndexOf("/") + 1));
+            path = getNativeBracketsDirectoryPath() + "/";
 
             // Remove module name from relative path. Remove trailing slash.
             pathname = decodeURI(module.uri);
diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js
@@ -623,16 +623,14 @@ define(function (require, exports, module) {
      * @return {!string} fullPath reference
      */
     function _getWelcomeProjectPath() {
-        var srcPath = decodeURI(window.location.pathname),
-            initialPath = srcPath.substr(0, srcPath.lastIndexOf("/")),
+        var initialPath = FileUtils.getNativeBracketsDirectoryPath(),
             sampleUrl = Urls.GETTING_STARTED;
         if (sampleUrl) {
             // Back up one more folder. The samples folder is assumed to be at the same level as
             // the src folder, and the sampleUrl is relative to the samples folder.
             initialPath = initialPath.substr(0, initialPath.lastIndexOf("/")) + "/samples/" + sampleUrl;
         }
 
-        initialPath = FileUtils.convertToNativePath(initialPath);
         return initialPath;
     }
     
@@ -960,7 +958,7 @@ define(function (require, exports, module) {
                     } else {
                         var errString = error.code === FileError.NO_MODIFICATION_ALLOWED_ERR ?
                                          Strings.NO_MODIFICATION_ALLOWED_ERR :
-                                         StringUtils.format(String.GENERIC_ERROR, error.code);
+                                         StringUtils.format(Strings.GENERIC_ERROR, error.code);
 
                         var errMsg = StringUtils.format(Strings.ERROR_CREATING_FILE,
                                         StringUtils.htmlEscape(data.rslt.name),

Original file line number	Diff line number	Diff line change
`@@ -483,6 +483,7 @@ define(function (require, exports, module) {`
`483`	`483`	`function (event) {`
`484`	`484`	`if (handleKey(_translateKeyboardEvent(event))) {`
`485`	`485`	`event.stopPropagation();`
	`486`	`+ event.preventDefault();`
`486`	`487`	`}`
`487`	`488`	`},`
`488`	`489`	`true`