Skip to content

Commit f6b1925

Browse files
committed
Make sure templates with fade class are hidden before the transition is applied. Closes blueimp#2654
1 parent ba45b81 commit f6b1925

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

jquery-ui.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML>
22
<!--
33
/*
4-
* jQuery File Upload Plugin jQuery UI Demo 8.7.1
4+
* jQuery File Upload Plugin jQuery UI Demo 8.7.2
55
* https://github.com/blueimp/jQuery-File-Upload
66
*
77
* Copyright 2013, Sebastian Tschan
@@ -147,7 +147,7 @@ <h3 class="title"></h3>
147147
<!-- The template to display files available for upload -->
148148
<script id="template-upload" type="text/x-tmpl">
149149
{% for (var i=0, file; file=o.files[i]; i++) { %}
150-
<tr class="template-upload fade" style="display:none">
150+
<tr class="template-upload fade">
151151
<td>
152152
<span class="preview"></span>
153153
</td>
@@ -160,7 +160,7 @@ <h3 class="title"></h3>
160160
<td>
161161
<p class="size">{%=o.formatFileSize(file.size)%}</p>
162162
{% if (!o.files.error) { %}
163-
<div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"></div>
163+
<div class="progress"></div>
164164
{% } %}
165165
</td>
166166
<td>
@@ -177,7 +177,7 @@ <h3 class="title"></h3>
177177
<!-- The template to display files available for download -->
178178
<script id="template-download" type="text/x-tmpl">
179179
{% for (var i=0, file; file=o.files[i]; i++) { %}
180-
<tr class="template-download fade" style="display:none">
180+
<tr class="template-download fade">
181181
<td>
182182
<span class="preview">
183183
{% if (file.thumbnailUrl) { %}

js/jquery.fileupload-jquery-ui.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@
6666
icons: {primary: 'ui-icon-cancel'},
6767
text: showIconText
6868
});
69+
if (node.hasClass('fade')) {
70+
node.hide();
71+
}
6972
return node;
7073
},
7174

@@ -76,6 +79,9 @@
7679
icons: {primary: 'ui-icon-trash'},
7780
text: showIconText
7881
});
82+
if (node.hasClass('fade')) {
83+
node.hide();
84+
}
7985
return node;
8086
},
8187

0 commit comments

Comments
 (0)