From acd2069d5a50dfa63003ab6fd24e468b7e92fe1b Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 16 Oct 2013 08:33:05 -0700 Subject: [PATCH] Fixed issues adding root folders Fixed: Error after adding new path when adding a new series Fixed: Can now add multiple paths without refreshing the page --- src/UI/AddSeries/SearchResultView.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/UI/AddSeries/SearchResultView.js b/src/UI/AddSeries/SearchResultView.js index 53bd3246b..bb81a5f84 100644 --- a/src/UI/AddSeries/SearchResultView.js +++ b/src/UI/AddSeries/SearchResultView.js @@ -44,10 +44,7 @@ define( this.listenTo(vent, Config.Events.ConfigUpdatedEvent, this._onConfigUpdated); this.listenTo(this.model, 'change', this.render); - this.listenTo(RootFolders, 'all', this.render); - - this.rootFolderLayout = new RootFolderLayout(); - this.listenTo(this.rootFolderLayout, 'folderSelected', this._setRootFolder); + this.listenTo(RootFolders, 'all', this._rootFoldersUpdated); }, onRender: function () { @@ -106,7 +103,9 @@ define( _rootFolderChanged: function () { var rootFolderValue = this.ui.rootFolder.val(); if (rootFolderValue === 'addNew') { - AppLayout.modalRegion.show(this.rootFolderLayout); + var rootFolderLayout = new RootFolderLayout(); + this.listenToOnce(rootFolderLayout, 'folderSelected', this._setRootFolder); + AppLayout.modalRegion.show(rootFolderLayout); } else { Config.setValue(Config.Keys.DefaultRootFolderId, rootFolderValue); @@ -152,6 +151,11 @@ define( promise.fail(function () { icon.removeClass('icon-spin icon-spinner disabled').addClass('icon-search'); }); + }, + + _rootFoldersUpdated: function () { + this._configureTemplateHelpers(); + this.render(); } });