BUGFIX: SSF-38 fixing the "Choose files from your computer" upload field

silverstripe · Apr 4, 2012 · 7f8a682 · 7f8a682
1 parent 875eef9
commit 7f8a682
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/admin/css/screen.css b/admin/css/screen.css
diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss
@@ -1343,6 +1343,10 @@ body.cms-dialog {
 		}
 	}
 
+	.ss-uploadfield-editandorganize {
+		display: none;
+	}
+
 	// TODO Consolidate with .assetuploadfield and .ss-uploadfield styles
 	.ss-htmleditorfield-file {
 		border: 1px solid lighten($color-medium-separator, 20%);

diff --git a/javascript/HtmlEditorField.js b/javascript/HtmlEditorField.js
@@ -700,13 +700,8 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
 		 * Show the second step after uploading an image
 		 */
 		$('form.htmleditorfield-form.htmleditorfield-mediaform div.ss-assetuploadfield').entwine({
-			onmatch: function() {
-				this._super();
-
-				// Always hide the "second step" part, we don't need it here
-				this.find('.ss-uploadfield-editandorganize').hide();
-
-			},
+			//the UploadField div.ss-uploadfield-editandorganize is hidden in CSS,
+			// because we use the detail view for each individual file instead
 			onfileuploadstop: function(e) {
 				var form = this.closest('form');