summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-08-29 17:07:54 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-08-29 17:07:54 +0200
commit25239690a39a24012886433cc26e6afd86afb04c (patch)
treee37697fbd58f5be7d4f68bd59009c7265ece2692 /js
parenta17700800cf475587ab3d0eb6acee91a56b5b40a (diff)
correct input behaviour
Diffstat (limited to 'js')
-rw-r--r--js/build/app.js14
-rw-r--r--js/controller/NavigationController.js15
2 files changed, 18 insertions, 11 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) => {