diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-11 19:36:34 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-11 19:36:34 +0200 |
| commit | 61395bc32d6f0cd53db66bac329428ea85e870cb (patch) | |
| tree | b10b884dc9afd81e82c747fd6443b8b04419fe26 /js | |
| parent | 9963975875836f768cc64f3a9dc00a1f33d9c07f (diff) | |
fixed linting errors
Diffstat (limited to 'js')
| -rw-r--r-- | js/app/controllers/feedcontroller.coffee | 2 | ||||
| -rw-r--r-- | js/app/services/bl/feedbl.coffee | 4 | ||||
| -rw-r--r-- | js/public/app.js | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/js/app/controllers/feedcontroller.coffee b/js/app/controllers/feedcontroller.coffee index 742693253..7c0cd05c2 100644 --- a/js/app/controllers/feedcontroller.coffee +++ b/js/app/controllers/feedcontroller.coffee @@ -51,7 +51,7 @@ angular.module('News').factory '_FeedController', @_$scope.feedEmptyError = false @_$scope.feedExistsError = false - try + try @_isAddingFeed = true @_feedBl.create feedUrl, parentFolderId # on success diff --git a/js/app/services/bl/feedbl.coffee b/js/app/services/bl/feedbl.coffee index 68b288297..9cedee57c 100644 --- a/js/app/services/bl/feedbl.coffee +++ b/js/app/services/bl/feedbl.coffee @@ -140,13 +140,15 @@ NewLoading, _ExistsError) -> feed = title: url.replace( - /^(?:https?:\/\/)?(?:www\.)?([a-z0-9_\-\.]+)(?:\/.*)?$/gi, + /^(?:https?:\/\/)?(?:www\.)?([a-z0-9_\-\.]+)(?:\/.*)?$/gi, '$1') url: url urlHash: urlHash @_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 d5201eac4..7182df822 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -758,6 +758,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. urlHash: urlHash }; this._feedModel.add(feed); + console.log(this._feedModel); success = function(response) { if (response.status === 'error') { feed.error = response.msg; |