Merge branch 'master' of github.com:mozilla/FlightDeck

media/jetpack/js/Package.js

@@ -590,6 +590,7 @@ var Attachment = new Class({
         delete packAttachments[oldUID];
 
         this.setOptions(options);
+        this.options.path = options.filename + '.' + options.type;
         packAttachments[options.uid] = this;
 
         var editorUID = this.getEditorID();
@@ -1071,7 +1072,7 @@ Package.Edit = new Class({
 			filename = filename.getFileName();
 		}
 		
-		var attachmentEl = fd.sidebar.getBranchFromFile(newName, 'data');
+		var attachmentEl = fd.sidebar.getBranchFromPath(newName, 'data');
 		var spinnerEl = attachmentEl || $(fd.sidebar.trees.data);
 		
 		new Request.JSON({

media/jetpack/js/Sidebar.js

@@ -229,7 +229,6 @@ var Sidebar = new Class({
 			options.nodrag = true;
 		}
 		
-		
 		var element = tree.addPath(file, options);	
 		tree.collapse.prepare();
 		
@@ -271,8 +270,6 @@ var Sidebar = new Class({
 	},
 	
 	removeFile: function(file, prefix) {
-		$log('sidebar destroy')
-	    
 	    if (file instanceof File) {
 	        file.destroy();
 	        return;
@@ -418,7 +415,6 @@ var Sidebar = new Class({
 						} else if (fileType == Module) {
 							fd.getItem().removeModules(file);
 						} else if (fileType == Attachment) {
-							$log('removing folder')
 							fd.getItem().removeAttachments(file);
 						}