Fix webpacking of loading icon.

This commit is contained in:
Surinder Kumar authored and Dave Page committed 2017-07-20 13:38:16 +01:00
1 parent 54882e061c
commit ae3acbdbbc
2 files changed
+9 -6

No files matched your search

@@ -31,9 +31,9 @@
</div> </div>
</div> </div>
<div class="fileinfo"> <div class="fileinfo">
<span class="activity"> <span class="activity">
<img src="{{ url_for('browser.static', filename='vendor/aciTree/image/load-root.gif') }}"> <img src="{{ url_for('static', filename='js/generated/img/load-root.gif') }}">
</span> </span>
<div class="file_listing"></div> <div class="file_listing"></div>
<div class="upload_file dropzone"></div> <div class="upload_file dropzone"></div>
<div class="allowed_file_types"></div> <div class="allowed_file_types"></div>
@@ -52,7 +52,6 @@
<button type='button' class='btn btn_no'>NO</button> <button type='button' class='btn btn_no'>NO</button>
</span> </span>
</div> </div>
</div> </div>
<script> <script>
require(['sources/generated/file_utils'], function() { require(['sources/generated/file_utils'], function() {
@@ -8,6 +8,7 @@
* @author Simon Georget <simon (at) linea21 (dot) com> * @author Simon Georget <simon (at) linea21 (dot) com>
* @copyright Authors * @copyright Authors
*/ */
import loading_icon from 'acitree/image/load-root.gif';
define(['jquery', 'underscore', 'underscore.string', define(['jquery', 'underscore', 'underscore.string',
'sources/alerts/alertify_wrapper', 'sources/gettext', 'sources/alerts/alertify_wrapper', 'sources/gettext',
@@ -505,11 +506,14 @@ var getFolderInfo = function(path, file_type) {
} else { } else {
$(".allowed_file_types .change_file_types").show(); $(".allowed_file_types .change_file_types").show();
} }
var img_url = url_for('browser.static') + 'vendor/aciTree/image/load-root.gif';
var loading_icon_url = url_for(
'static', {'filename': 'js/generated/' + loading_icon }
);
// Display an activity indicator. // Display an activity indicator.
$('.fileinfo').find('span.activity').html( $('.fileinfo').find('span.activity').html(
"<img src='" + img_url + ">" '<img src="' + loading_icon_url + '"/>'
); );
var post_data = { var post_data = {