diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-11 19:45:36 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-11 19:45:36 +0200 |
| commit | aa208e38b63d1d982feb3f5f3583c3c9d909e4f1 (patch) | |
| tree | 4544708e7b9f5a63a6f7a7bfaa263d3069e8cf95 /js | |
| parent | 61395bc32d6f0cd53db66bac329428ea85e870cb (diff) | |
fixed folderselection
Diffstat (limited to 'js')
| -rw-r--r-- | js/app/services/bl/feedbl.coffee | 3 | ||||
| -rw-r--r-- | js/public/app.js | 4 | ||||
| -rw-r--r-- | js/tests/services/bl/feedblSpec.coffee | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/js/app/services/bl/feedbl.coffee b/js/app/services/bl/feedbl.coffee index 9cedee57c..8828f0c85 100644 --- a/js/app/services/bl/feedbl.coffee +++ b/js/app/services/bl/feedbl.coffee @@ -144,11 +144,10 @@ NewLoading, _ExistsError) -> '$1') url: url urlHash: urlHash + folderId: parentId @_feedModel.add(feed) - console.log @_feedModel - success = (response) => if response.status == 'error' feed.error = response.msg diff --git a/js/public/app.js b/js/public/app.js index 7182df822..8fe0d0354 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -755,10 +755,10 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. feed = { title: url.replace(/^(?:https?:\/\/)?(?:www\.)?([a-z0-9_\-\.]+)(?:\/.*)?$/gi, '$1'), url: url, - urlHash: urlHash + urlHash: urlHash, + folderId: parentId }; this._feedModel.add(feed); - console.log(this._feedModel); success = function(response) { if (response.status === 'error') { feed.error = response.msg; diff --git a/js/tests/services/bl/feedblSpec.coffee b/js/tests/services/bl/feedblSpec.coffee index 2b355d871..1412225e5 100644 --- a/js/tests/services/bl/feedblSpec.coffee +++ b/js/tests/services/bl/feedblSpec.coffee @@ -252,6 +252,7 @@ describe 'FeedBl', -> expect(feed.title).toBe('google.de') expect(feed.url).toBe(url) expect(feed.urlHash).toBe(hash) + expect(feed.folderId).toBe(0) it 'should transform urls correctly', => |