Merge branch '3.0'

silverstripe · Jun 24, 2012 · 7685a0b · 7685a0b
2 parents ba9c3c7 + 682a6a0
commit 7685a0b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 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
@@ -1452,7 +1452,7 @@ body.cms-dialog {
 			float:left;
 			position: relative;
 
-        	label {
+      label {
 				position: absolute;
 				left: 8px;
 				top: 13px;
@@ -1491,6 +1491,12 @@ body.cms-dialog {
 				}
 			}
 		}
+
+		.loading button.add-url .ui-icon {
+			background-image: url(../images/throbber.gif);
+			background-position: 50% 50%;
+			background-repeat: no-repeat;
+		}
 	}
 
 	.cms-content-header{

diff --git a/javascript/HtmlEditorField.js b/javascript/HtmlEditorField.js
@@ -762,7 +762,7 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
 
 				// TODO Depends on managed mime type
 				if(node.is('img')) {
-					this.showFileView(node.data('url') || node.attr('src'), function() {
+					this.showFileView(node.data('url') || node.attr('src')).complete(function() {
 						$(this).updateFromNode(node);
 						self.toggleCloseButton();
 						self.redraw();
@@ -811,7 +811,7 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
 
 				item.addClass('loading');
 				this.find('.content-edit').append(item);
-				$.ajax({
+				return $.ajax({
 					// url: this.data('urlViewfile') + '?ID=' + id,
 					url: $.path.addSearchParams(this.attr('action').replace(/MediaForm/, 'viewfile'), params),
 					success: function(html, status, xhr) {
@@ -908,11 +908,13 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
 			},
 
 			onclick: function(e) {
-				var urlField = this.getURLField();
+				var urlField = this.getURLField(), container = this.closest('.CompositeField'), form = this.closest('form');
 
 				if (urlField.validate()) {
-					var form = this.closest('form');
-					form.showFileView('http://' + urlField.val());
+					container.addClass('loading');
+					form.showFileView('http://' + urlField.val()).complete(function() {
+						container.removeClass('loading');
+					});
 					form.redraw();
 				}