Merge pull request #24 from iwizardpro/patch-2

Version history functionality (Quotes in file paths, disable reverting on error)
coreh-deprecated · Dec 29, 2011 · f38e179 · f38e179
2 parents 2c5735a + 4752caf
commit f38e179
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/client/js/CodeEditor.js b/client/js/CodeEditor.js
@@ -114,8 +114,10 @@
         var loadVersionNumbered = function(i) {
             if (!versions[i].content) {
                 connection.loadVersion(versions[i].uuid, function(err, contents) {
+                    galaxyBackground.revert.disabled = false;
                     if (err) {
-                        contents = '<ERROR: Could not load file contents>'
+                        contents = '<ERROR: Could not load file contents>';
+                        galaxyBackground.revert.disabled = true;
                     }
                     var codeMirror = createCodeMirror(versionEditors[i], contents, entry.path, { readOnly: true })
                     versions[i].content = contents;

diff --git a/server/project.js b/server/project.js
@@ -31,7 +31,7 @@ setInterval(function() {
                 date: (new Date()).valueOf(),
                 uuid: generatedUuid
             })
-            exec('cp -- "' + (process.cwd() + file) + '" "' + (process.cwd() + '/.nide/' + generatedUuid) + '"', function(err) {
+            exec('cp -- "' + (process.cwd() + file).replace(/[\\"']/g, '\\$&').replace(/\u0000/g, '\\0') + '" "' + (process.cwd() + '/.nide/' + generatedUuid).replace(/[\\"']/g, '\\$&').replace(/\u0000/g, '\\0') + '"', function(err) {
                 if (!err) {
                     saveVersionHistory()
                 }