fix #75

1 files changed, 24 insertions, 16 deletions

diff --git a/templates/part.navigation.addfeed.php b/templates/part.navigation.addfeed.php
index 6afc31c5d..5ef8e858a 100644
--- a/templates/part.navigation.addfeed.php
+++ b/templates/part.navigation.addfeed.php
@@ -7,58 +7,66 @@
 
     <div class="add-new-popup" id="new-feed">
 
-        <form ng-submit="Navigation.createFeed(feed)" name="feedform">
+        <form ng-submit="Navigation.createFeed(Navigation.feed)" name="feedform">
             <fieldset ng-disabled="Navigation.addingFeed">
                 <input type="text"
-                    ng-model="feed.url"
-                    ng-class="{'ng-invalid': !Navigation.addingFeed && Navigation.feedUrlExists(feed.url)}"
+                    ng-model="Navigation.feed.url"
+                    ng-class="{'ng-invalid':
+                        !Navigation.addingFeed &&
+                        Navigation.feedUrlExists(Navigation.feed.url)
+                    }"
                     placeholder="<?php p($l->t('Web address')); ?>"
                     name="address"
                     pattern="[^\s]+"
                     required>
 
                 <p class="error"
-                    ng-show="!Navigation.addingFeed && Navigation.feedUrlExists(feed.url)">
+                    ng-show="!Navigation.addingFeed && Navigation.feedUrlExists(Navigation.feed.url)">
                     <?php p($l->t('Feed exists already!')); ?>
                 </p>
 
                 <!-- select a folder -->
                 <select name="folder"
                     title="<?php p($l->t('Folder')); ?>"
-                    ng-if="!Navigation.newFolder"
-                    ng-model="$parent.feed.existingFolder"
+                    ng-if="!Navigation.showNewFolder"
+                    ng-model="Navigation.feed.existingFolder"
                     ng-options="folder.name for folder in Navigation.getFolders() track by folder.name">
                     <option value="">-- <?php p($l->t('No folder')); ?> --</option>
                 </select>
                 <button type="button"
                         class="icon-add add-new-folder-primary"
-                        ng-hide="Navigation.newFolder"
+                        ng-hide="Navigation.showNewFolder"
                         title="<?php p($l->t('New folder')); ?>"
-                        ng-click="Navigation.newFolder=true"
+                        ng-click="Navigation.showNewFolder=true"
                         news-focus="#new-feed [name='folderName']"></button>
 
                 <!-- add a folder -->
                 <input type="text"
-                       ng-model="$parent.feed.newFolder"
-                       ng-class="{'ng-invalid': !Navigation.addingFeed && !Navigation.addingFeed && Navigation.newFolder && Navigation.folderNameExists($parent.feed.newFolder)}"
+                       ng-model="Navigation.feed.newFolder"
+                       ng-class="{'ng-invalid':
+                            !Navigation.addingFeed &&
+                            !Navigation.addingFeed &&
+                            Navigation.showNewFolder &&
+                            Navigation.folderNameExists(Navigation.feed.newFolder)
+                        }"
                        placeholder="<?php p($l->t('Folder name')); ?>"
                        name="folderName"
-                       ng-if="Navigation.newFolder"
+                       ng-if="Navigation.showNewFolder"
                        required>
                 <button type="button"
-                        ng-show="Navigation.newFolder"
+                        ng-show="Navigation.showNewFolder"
                         class="icon-close add-new-folder-primary"
                         title="<?php p($l->t('Go back')); ?>"
-                        ng-click="Navigation.newFolder=false; feed.folder=''"></button>
+                        ng-click="Navigation.showNewFolder=false; Navigation.feed.newFolder=''"></button>
 
 
-                <p class="error" ng-show="!Navigation.addingFeed && Navigation.folderNameExists(feed.newFolder)"><?php p($l->t('Folder exists already!')); ?></p>
+                <p class="error" ng-show="!Navigation.addingFeed && Navigation.folderNameExists(Navigation.feed.newFolder)"><?php p($l->t('Folder exists already!')); ?></p>
 
                 <input type="submit"
                     value="<?php p($l->t('Subscribe')); ?>"
                     class="primary"
-                    ng-disabled="Navigation.feedUrlExists(feed.url) ||
-                                (Navigation.newFolder && Navigation.folderNameExists(folder.name))">
+                    ng-disabled="Navigation.feedUrlExists(Navigation.feed.url) ||
+                                (Navigation.showNewFolder && Navigation.folderNameExists(folder.name))">
             </fieldset>
         </form>
     </div>