mirror of
https://github.com/Radarr/Radarr.git
synced 2024-09-11 03:52:33 +02:00
Fixed LoadingView
This commit is contained in:
parent
fb26cbb4a4
commit
0208ae8347
@ -6,8 +6,9 @@ define(
|
||||
'AddSeries/RootFolders/CollectionView',
|
||||
'AddSeries/RootFolders/Collection',
|
||||
'AddSeries/RootFolders/Model',
|
||||
'Shared/LoadingView',
|
||||
'Mixins/AutoComplete'
|
||||
], function (Marionette, RootFolderCollectionView, RootFolderCollection, RootFolderModel) {
|
||||
], function (Marionette, RootFolderCollectionView, RootFolderCollection, RootFolderModel, LoadingView) {
|
||||
|
||||
return Marionette.Layout.extend({
|
||||
template: 'AddSeries/RootFolders/LayoutTemplate',
|
||||
@ -33,6 +34,7 @@ define(
|
||||
|
||||
onRender: function () {
|
||||
var self = this;
|
||||
this.currentDirs.show(new LoadingView());
|
||||
|
||||
RootFolderCollection.promise.done(function () {
|
||||
self.currentDirs.show(self.rootfolderListView);
|
||||
|
@ -11,7 +11,7 @@
|
||||
{{#if items}}
|
||||
<h4>Recent Folders</h4>
|
||||
{{/if}}
|
||||
<div id="current-dirs" class="root-folders-list">loading ...</div>
|
||||
<div id="current-dirs" class="root-folders-list"></div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn" data-dismiss="modal">close</button>
|
||||
|
@ -6,11 +6,11 @@ define(
|
||||
'Episode/Search/ButtonsView',
|
||||
'Episode/Search/ManualLayout',
|
||||
'Release/Collection',
|
||||
'Shared/SpinnerView',
|
||||
'Shared/LoadingView',
|
||||
'Shared/Messenger',
|
||||
'Commands/CommandController',
|
||||
'Shared/FormatHelpers'
|
||||
], function (App, Marionette, ButtonsView, ManualSearchLayout, ReleaseCollection, SpinnerView, Messenger, CommandController, FormatHelpers) {
|
||||
], function (App, Marionette, ButtonsView, ManualSearchLayout, ReleaseCollection, LoadingView, Messenger, CommandController, FormatHelpers) {
|
||||
|
||||
return Marionette.Layout.extend({
|
||||
template: 'Episode/Search/LayoutTemplate',
|
||||
@ -59,7 +59,7 @@ define(
|
||||
|
||||
var self = this;
|
||||
|
||||
this.mainView = new SpinnerView();
|
||||
this.mainView = new LoadingView();
|
||||
this._showMainView();
|
||||
|
||||
var releases = new ReleaseCollection();
|
||||
|
@ -8,8 +8,9 @@ define(
|
||||
'Series/EpisodeFileCollection',
|
||||
'Cells/FileSizeCell',
|
||||
'Cells/QualityCell',
|
||||
'Episode/Summary/NoFileView'
|
||||
], function (App, Marionette, Backgrid, EpisodeFileModel, EpisodeFileCollection, FileSizeCell, QualityCell, NoFileView) {
|
||||
'Episode/Summary/NoFileView',
|
||||
'Shared/LoadingView'
|
||||
], function (App, Marionette, Backgrid, EpisodeFileModel, EpisodeFileCollection, FileSizeCell, QualityCell, NoFileView, LoadingView) {
|
||||
|
||||
return Marionette.Layout.extend({
|
||||
template: 'Episode/Summary/EpisodeSummaryLayoutTemplate',
|
||||
@ -61,6 +62,8 @@ define(
|
||||
}
|
||||
|
||||
else {
|
||||
this.activity.show(new LoadingView());
|
||||
|
||||
var self = this;
|
||||
var newEpisodeFile = new EpisodeFileModel({ id: episodeFileId });
|
||||
var newEpisodeFileCollection = new EpisodeFileCollection(newEpisodeFile, { seriesId: this.model.get('seriesId') });
|
||||
|
@ -9,8 +9,8 @@ define(
|
||||
'Cells/FileSizeCell',
|
||||
'Cells/QualityCell',
|
||||
'Cells/ApprovalStatusCell',
|
||||
'Shared/SpinnerView'
|
||||
], function (Marionette, Backgrid, ReleaseCollection, IndexerCell, EpisodeNumberCell, FileSizeCell, QualityCell, ApprovalStatusCell, SpinnerView) {
|
||||
'Shared/LoadingView'
|
||||
], function (Marionette, Backgrid, ReleaseCollection, IndexerCell, EpisodeNumberCell, FileSizeCell, QualityCell, ApprovalStatusCell, LoadingView) {
|
||||
return Marionette.Layout.extend({
|
||||
template: 'Release/LayoutTemplate',
|
||||
|
||||
@ -80,7 +80,7 @@ define(
|
||||
|
||||
var self = this;
|
||||
|
||||
this.grid.show(new SpinnerView());
|
||||
this.grid.show(new LoadingView());
|
||||
|
||||
this.fetchPromise.done(function () {
|
||||
self.showTable();
|
||||
|
@ -1 +1,8 @@
|
||||
loading ...
|
||||
<div class="row">
|
||||
<div id="followingBalls">
|
||||
<div id="ball-1" class="ball"></div>
|
||||
<div id="ball-2" class="ball"></div>
|
||||
<div id="ball-3" class="ball"></div>
|
||||
<div id="ball-4" class="ball"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -1,8 +0,0 @@
|
||||
<div class="row">
|
||||
<div id="followingBalls">
|
||||
<div id="ball-1" class="ball"></div>
|
||||
<div id="ball-2" class="ball"></div>
|
||||
<div id="ball-3" class="ball"></div>
|
||||
<div id="ball-4" class="ball"></div>
|
||||
</div>
|
||||
</div>
|
@ -1,12 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
define(
|
||||
[
|
||||
'marionette'
|
||||
], function (Marionette) {
|
||||
return Marionette.ItemView.extend({
|
||||
template : 'Shared/SpinnerTemplate',
|
||||
});
|
||||
});
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user