tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Fix ability to edit files immeditately after upload

Browse Source 
Conflicts:
	javascript/dist/UploadField.js
This commit is contained in:
scott1702 2016-02-19 15:05:54 +13:00 committed by Ingo Schommer
parent 7337f26d3a
commit 7580d35be8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
javascript/dist/UploadField.js vendored
View File

@ -417,10 +417,11 @@
} }
if (iframe.attr('src') == 'about:blank') { if (iframe.attr('src') == 'about:blank') {
var disabled = this.siblings();
iframe.attr('src', iframe.data('src')); iframe.attr('src', iframe.data('src'));
iframe.parent().addClass('loading'); iframe.parent().addClass('loading');
disabled = this.siblings();
disabled.addClass('ui-state-disabled'); disabled.addClass('ui-state-disabled');
disabled.attr('disabled', 'disabled'); disabled.attr('disabled', 'disabled');

3
javascript/src/UploadField.js
View File

@ -430,13 +430,14 @@ $.entwine('ss', function($) {
} }
if (iframe.attr('src') == 'about:blank') { if (iframe.attr('src') == 'about:blank') {
var disabled = this.siblings();
// Lazy-load the iframe on editform toggle // Lazy-load the iframe on editform toggle
iframe.attr('src', iframe.data('src')); iframe.attr('src', iframe.data('src'));
// Add loading class, disable buttons while loading is in progress // Add loading class, disable buttons while loading is in progress
// (_prepareIframe() handles re-enabling them when appropriate) // (_prepareIframe() handles re-enabling them when appropriate)
iframe.parent().addClass('loading'); iframe.parent().addClass('loading');
disabled=this.siblings();
disabled.addClass('ui-state-disabled'); disabled.addClass('ui-state-disabled');
disabled.attr('disabled', 'disabled'); disabled.attr('disabled', 'disabled');