Added loading to recent folder list

11 years ago · df1cb91a84
parent 040bfb08ce
commit df1cb91a84
3 changed files with 7 additions and 3 deletions
--- a/UI/AddSeries/AddSeriesLayout.js
+++ b/UI/AddSeries/AddSeriesLayout.js
@ -38,7 +38,7 @@ define(

                SeriesCollection.fetch();
                QualityProfileCollection.fetch();
-                RootFolderCollection.fetch();
+                RootFolderCollection.promise = RootFolderCollection.fetch();
            },

            onShow: function () {
--- a/UI/AddSeries/RootFolders/Layout.js
+++ b/UI/AddSeries/RootFolders/Layout.js
@ -32,8 +32,12 @@ define(
            },

            onRender: function () {
+                var self = this;
+
+                RootFolderCollection.promise.done(function () {
+                    self.currentDirs.show(self.rootfolderListView);
+                });

-                this.currentDirs.show(this.rootfolderListView);
                this.ui.pathInput.autoComplete('/directories');
            },

--- a/UI/AddSeries/RootFolders/LayoutTemplate.html
+++ b/UI/AddSeries/RootFolders/LayoutTemplate.html
@ -11,7 +11,7 @@
    {{#if items}}
    <h4>Recent Folders</h4>
    {{/if}}
-    <div id="current-dirs" class="root-folders-list"></div>
+    <div id="current-dirs" class="root-folders-list">loading ...</div>
 </div>
 <div class="modal-footer">
    <button class="btn" data-dismiss="modal">close</button>