diff options
| -rw-r--r-- | js/build/app.js | 14 | ||||
| -rw-r--r-- | js/controller/NavigationController.js | 15 | ||||
| -rw-r--r-- | templates/part.addfeed.php | 2 | ||||
| -rw-r--r-- | templates/part.addfolder.php | 4 |
4 files changed, 21 insertions, 14 deletions
diff --git a/js/build/app.js b/js/build/app.js index deb23419b..b2cb2dafe 100644 --- a/js/build/app.js +++ b/js/build/app.js @@ -301,6 +301,7 @@ var $__build_47_app__ = function () { 'SettingsResource', function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource, SettingsResource) { 'use strict'; + var $__0 = this; this.feedError = ''; this.folderError = ''; this.getFeeds = function () { @@ -385,14 +386,17 @@ var $__build_47_app__ = function () { this.folderNameExists = function (folderName) { return FolderResource.get(folderName) !== undefined; }; - this.createFolder = function (folderName) { - console.log(folderName); - }; this.isAddingFolder = function () { return true; }; - this.createFeed = function (feedUrl, folderId) { - console.log(feedUrl + folderId); + this.createFolder = function (folder) { + console.log(folder.name); + folder.name = ''; + }; + this.createFeed = function (feed) { + $__0.newFolder = false; + console.log(feed.url + feed.folder); + feed.url = ''; }; this.cancelRenameFolder = function (folderId) { console.log(folderId); diff --git a/js/controller/NavigationController.js b/js/controller/NavigationController.js index d5e159de9..485f7a387 100644 --- a/js/controller/NavigationController.js +++ b/js/controller/NavigationController.js @@ -115,17 +115,20 @@ function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource, return FolderResource.get(folderName) !== undefined; }; - this.createFolder = (folderName) => { - console.log(folderName); - }; - // TBD this.isAddingFolder = () => { return true; }; - this.createFeed = (feedUrl, folderId) => { - console.log(feedUrl + folderId); + this.createFolder = (folder) => { + console.log(folder.name); + folder.name = ''; + }; + + this.createFeed = (feed) => { + this.newFolder = false; + console.log(feed.url + feed.folder); + feed.url = ''; }; this.cancelRenameFolder = (folderId) => { diff --git a/templates/part.addfeed.php b/templates/part.addfeed.php index 73b66bf92..39063a426 100644 --- a/templates/part.addfeed.php +++ b/templates/part.addfeed.php @@ -7,7 +7,7 @@ <div class="add-new-popup" id="new-feed"> - <form ng-submit="Navigation.createFeed(feed.url, feed.folder)" name="feedform"> + <form ng-submit="Navigation.createFeed(feed)" name="feedform"> <input type="text" ng-model="feed.url" placeholder="<?php p($l->t('Web address')); ?>" diff --git a/templates/part.addfolder.php b/templates/part.addfolder.php index 3fb48526e..dde48ad2f 100644 --- a/templates/part.addfolder.php +++ b/templates/part.addfolder.php @@ -7,11 +7,11 @@ <div class="add-new-popup" id="new-folder"> - <form ng-submit="Navigation.createFolder(folderName)" name="folderform"> + <form ng-submit="Navigation.createFolder(folder)" name="folderform"> <!-- add a folder --> <input type="text" - ng-model="folderName" + ng-model="folder.name" placeholder="<?php p($l->t('Folder name')); ?>" title="<?php p($l->t('Folder name')); ?>" name="folderName" |