diff --git a/media/js/newsblur/common/assetmodel.js b/media/js/newsblur/common/assetmodel.js index 6c0a3a1c4..d48a3925d 100644 --- a/media/js/newsblur/common/assetmodel.js +++ b/media/js/newsblur/common/assetmodel.js @@ -459,7 +459,7 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({ if (NEWSBLUR.reader.flags['non_premium_river_view']) { var visible_stories = self.stories.visible().length; var max_stories = NEWSBLUR.reader.constants.RIVER_STORIES_FOR_STANDARD_ACCOUNT; - console.log(["checking no more stories", visible_stories, max_stories]); + NEWSBLUR.log(["checking no more stories", visible_stories, max_stories]); if (visible_stories >= max_stories) { self.flags['no_more_stories'] = true; self.stories.trigger('no_more_stories'); @@ -1133,7 +1133,7 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({ follow_user: function(user_id, callback) { this.make_request('/social/follow', {'user_id': user_id}, _.bind(function(data) { - console.log(["follow data", data]); + NEWSBLUR.log(["follow data", data]); this.user_profile.set(data.user_profile); var following_profile = this.following_profiles.detect(function(profile) { return profile.get('user_id') == data.follow_profile.user_id; diff --git a/media/js/newsblur/common/router.js b/media/js/newsblur/common/router.js index dbe651230..4ff9f84b1 100644 --- a/media/js/newsblur/common/router.js +++ b/media/js/newsblur/common/router.js @@ -14,21 +14,21 @@ NEWSBLUR.Router = Backbone.Router.extend({ }, index: function() { - // console.log(["index"]); + // NEWSBLUR.log(["index"]); NEWSBLUR.reader.show_splash_page(); }, add_site: function() { - console.log(["add", window.location, $.getQueryString('url')]); + NEWSBLUR.log(["add", window.location, $.getQueryString('url')]); NEWSBLUR.reader.open_add_feed_modal({url: $.getQueryString('url')}); }, try_site: function() { - console.log(["try", window.location]); + NEWSBLUR.log(["try", window.location]); }, site: function(site_id, slug) { - // console.log(["site", site_id, slug]); + // NEWSBLUR.log(["site", site_id, slug]); site_id = parseInt(site_id, 10); var feed = NEWSBLUR.reader.model.get_feed(site_id); if (feed) { @@ -41,7 +41,7 @@ NEWSBLUR.Router = Backbone.Router.extend({ }, social: function(user_id, slug) { - // console.log(["router:social", user_id, slug]); + // NEWSBLUR.log(["router:social", user_id, slug]); var feed_id = "social:" + user_id; if (NEWSBLUR.reader.model.get_feed(feed_id)) { NEWSBLUR.reader.open_social_stories(feed_id, {force: true}); @@ -56,7 +56,7 @@ NEWSBLUR.Router = Backbone.Router.extend({ }, user: function(user) { - console.log(["user", user]); + NEWSBLUR.log(["user", user]); } }); \ No newline at end of file diff --git a/media/js/newsblur/models/social_subscription.js b/media/js/newsblur/models/social_subscription.js index e6d2015d0..ede1a25d0 100644 --- a/media/js/newsblur/models/social_subscription.js +++ b/media/js/newsblur/models/social_subscription.js @@ -16,7 +16,7 @@ NEWSBLUR.Models.SocialSubscription = Backbone.Model.extend({ }, on_remove: function() { - console.log(["Remove Feed", this, this.views]); + NEWSBLUR.log(["Remove Feed", this, this.views]); _.each(this.views, function(view) { view.remove(); }); }, diff --git a/media/js/newsblur/reader/reader.js b/media/js/newsblur/reader/reader.js index 7e871c2df..ad36a84b2 100644 --- a/media/js/newsblur/reader/reader.js +++ b/media/js/newsblur/reader/reader.js @@ -999,7 +999,7 @@ var slug = _.string.words(_.string.clean(feed_title.replace(/[^a-z0-9\. ]/ig, ''))).join('-').toLowerCase(); var url = "site/" + feed.id + "/" + slug; if (!_.string.include(window.location.pathname, url)) { - // console.log(["Navigating to url", url]); + // NEWSBLUR.log(["Navigating to url", url]); NEWSBLUR.router.navigate(url); } } @@ -1008,7 +1008,7 @@ post_open_feed: function(e, data, first_load) { if (!data) { - console.log(["No data from feed, trying again..."]); + NEWSBLUR.log(["No data from feed, trying again..."]); return this.open_feed(this.active_feed, {force: true}); } var stories = data.stories; @@ -1257,7 +1257,7 @@ // ================== open_social_stories: function(feed_id, options) { - // console.log(["open_social_stories", feed_id, options]); + // NEWSBLUR.log(["open_social_stories", feed_id, options]); options = options || {}; if (_.isNumber(feed_id)) feed_id = "social:" + feed_id; @@ -1320,11 +1320,11 @@ if (_.string.include(window.location.pathname, "social/" + feed.get('user_id'))) { params['replace'] = true; } - // console.log(["Navigating to social", url, window.location.pathname]); + // NEWSBLUR.log(["Navigating to social", url, window.location.pathname]); NEWSBLUR.router.navigate(url, params); } } else if (!feed.get('feed_title')) { - console.log(["No feed title on social", feed]); + NEWSBLUR.log(["No feed title on social", feed]); NEWSBLUR.router.navigate(''); } }, @@ -1420,7 +1420,7 @@ }, show_stories_error: function() { - console.log(["show_stories_error", arguments]); + NEWSBLUR.log(["show_stories_error", arguments]); this.hide_stories_progress_bar(); NEWSBLUR.app.original_tab_view.iframe_not_busting(); @@ -1463,7 +1463,7 @@ if (found_story_in_page === false) { // Story not found, show in feed view with link to page view if (this.story_view == 'page' && !this.flags['page_view_showing_feed_view']) { - // console.log(['turn on feed view', this.flags['page_view_showing_feed_view'], this.flags['feed_view_showing_story_view']]); + // NEWSBLUR.log(['turn on feed view', this.flags['page_view_showing_feed_view'], this.flags['feed_view_showing_story_view']]); this.flags['page_view_showing_feed_view'] = true; this.flags['feed_view_showing_story_view'] = false; this.switch_taskbar_view('feed', 'page'); @@ -1471,12 +1471,12 @@ } } else { if (this.story_view == 'page' && this.flags['page_view_showing_feed_view']) { - // console.log(['turn off feed view', this.flags['page_view_showing_feed_view'], this.flags['feed_view_showing_story_view']]); + // NEWSBLUR.log(['turn off feed view', this.flags['page_view_showing_feed_view'], this.flags['feed_view_showing_story_view']]); this.flags['page_view_showing_feed_view'] = false; this.flags['feed_view_showing_story_view'] = false; this.switch_taskbar_view('page'); } else if (this.flags['feed_view_showing_story_view']) { - // console.log(['turn off story view', this.flags['page_view_showing_feed_view'], this.flags['feed_view_showing_story_view']]); + // NEWSBLUR.log(['turn off story view', this.flags['page_view_showing_feed_view'], this.flags['feed_view_showing_story_view']]); this.flags['page_view_showing_feed_view'] = false; this.flags['feed_view_showing_story_view'] = false; this.switch_taskbar_view(this.story_view, true); @@ -2070,7 +2070,7 @@ self.flags.scrolling_by_selecting_story_title = false; }, 550); if (view == 'page') { - console.log(["iframe_prevented_from_loading", this.flags['iframe_prevented_from_loading']]); + NEWSBLUR.log(["iframe_prevented_from_loading", this.flags['iframe_prevented_from_loading']]); if (this.flags['iframe_prevented_from_loading']) { NEWSBLUR.app.original_tab_view.load_feed_iframe(); } @@ -2233,7 +2233,7 @@ make_manage_menu: function(type, feed_id, story_id, inverse, $item) { var $manage_menu; - // console.log(["make_manage_menu", type, feed_id, story_id, inverse, $item]); + // NEWSBLUR.log(["make_manage_menu", type, feed_id, story_id, inverse, $item]); if (type == 'site') { var show_chooser = !NEWSBLUR.Globals.is_premium && NEWSBLUR.Globals.is_authenticated; @@ -3304,7 +3304,7 @@ $stories_show = $stories_show.not('.NB-feed-story'); $stories_hide = $stories_hide.not('.NB-feed-story'); } - console.log(["single story", $stories_show.length, $stories_hide.length, this.active_story, active_story && active_story.id]); + NEWSBLUR.log(["single story", $stories_show.length, $stories_hide.length, this.active_story, active_story && active_story.id]); } if (!options['animate']) { @@ -3369,9 +3369,9 @@ // this.socket.refresh_feeds = _.debounce(_.bind(this.force_feeds_refresh, this), 1000*10); this.socket.on('connect', _.bind(function() { var active_feeds = this.send_socket_active_feeds(); - // console.log(["Connected to real-time pubsub with " + active_feeds.length + " feeds."]); + // NEWSBLUR.log(["Connected to real-time pubsub with " + active_feeds.length + " feeds."]); this.socket.on('feed:update', _.bind(function(feed_id, message) { - console.log(['Real-time feed update', feed_id, message]); + NEWSBLUR.log(['Real-time feed update', feed_id, message]); this.force_feeds_refresh(false, false, feed_id); }, this)); @@ -3382,14 +3382,14 @@ $('.NB-module-content-account-realtime').attr('title', 'Reticulating splines').removeClass('NB-error'); }, this)); this.socket.on('disconnect', _.bind(function() { - console.log(["Lost connection to real-time pubsub. Falling back to polling."]); + NEWSBLUR.log(["Lost connection to real-time pubsub. Falling back to polling."]); this.flags.feed_refreshing_in_realtime = false; this.setup_feed_refresh(); $('.NB-module-content-account-realtime-subtitle').html($.make('b', 'Updating every 60 sec')); $('.NB-module-content-account-realtime').attr('title', 'Polling for updates...').addClass('NB-error'); }, this)); this.socket.on('error', _.bind(function() { - console.log(["Can't connect to real-time pubsub."]); + NEWSBLUR.log(["Can't connect to real-time pubsub."]); this.flags.feed_refreshing_in_realtime = false; $('.NB-module-content-account-realtime-subtitle').html($.make('b', 'Updating every 60 sec')); $('.NB-module-content-account-realtime').attr('title', 'Polling for updates...').addClass('NB-error'); @@ -3449,11 +3449,11 @@ self.model.refresh_feeds(_.bind(function(updated_feeds) { self.post_feed_refresh(updated_feeds); }, self), self.flags['has_unfetched_feeds'], null, function(e) { - console.log(["Feed refresh error", e]); + NEWSBLUR.log(["Feed refresh error", e]); }); } }, refresh_interval); - // console.log(["Setting refresh interval to every " + refresh_interval/1000 + " seconds."]); + // NEWSBLUR.log(["Setting refresh interval to every " + refresh_interval/1000 + " seconds."]); }, force_feed_refresh: function(feed_id, new_feed_id) { @@ -3996,7 +3996,7 @@ }, show_tryfeed_add_button: function() { - console.log(["show_tryfeed_add_button", this.$s.$story_taskbar.find('.NB-tryfeed-add:visible').length]); + NEWSBLUR.log(["show_tryfeed_add_button", this.$s.$story_taskbar.find('.NB-tryfeed-add:visible').length]); if (this.$s.$story_taskbar.find('.NB-tryfeed-add:visible').length) return; var $add = $.make('div', { className: 'NB-modal-submit' }, [ diff --git a/media/js/newsblur/reader/reader_account.js b/media/js/newsblur/reader/reader_account.js index 60fbe68d2..966c6fef9 100644 --- a/media/js/newsblur/reader/reader_account.js +++ b/media/js/newsblur/reader/reader_account.js @@ -199,7 +199,7 @@ _.extend(NEWSBLUR.ReaderAccount.prototype, { select_preferences: function() { var pref = this.model.preference; $('input[name=send_emails]', this.$modal).each(function() { - console.log(["pref", pref('send_emails'), $(this).val()]); + NEWSBLUR.log(["pref", pref('send_emails'), $(this).val()]); if ($(this).val() == ""+pref('send_emails')) { $(this).attr('checked', true); return false; @@ -229,7 +229,7 @@ _.extend(NEWSBLUR.ReaderAccount.prototype, { $('.NB-preference-error', this.$modal).text(''); $('input[type=submit]', this.$modal).val('Saving...').attr('disabled', true).addClass('NB-disabled'); - console.log(["form['send_emails']", form['send_emails']]); + NEWSBLUR.log(["form['send_emails']", form['send_emails']]); this.model.preference('send_emails', form['send_emails']); this.model.save_account_settings(form, function(data) { if (data.code == -1) { diff --git a/media/js/newsblur/reader/reader_social_profile.js b/media/js/newsblur/reader/reader_social_profile.js index b9a8ab799..4b1b59c83 100644 --- a/media/js/newsblur/reader/reader_social_profile.js +++ b/media/js/newsblur/reader/reader_social_profile.js @@ -7,7 +7,7 @@ NEWSBLUR.ReaderSocialProfile = function(user_id, options) { this.model = NEWSBLUR.assets; this.profiles = new NEWSBLUR.Collections.Users(); user_id = parseInt(_.string.ltrim(user_id, 'social:'), 10); - console.log(["user_id", user_id]); + NEWSBLUR.log(["user_id", user_id]); this.runner(user_id); }; @@ -102,7 +102,7 @@ _.extend(NEWSBLUR.ReaderSocialProfile.prototype, { }, populate_friends: function(data) { - console.log(["populate_friends", data, this.profile.get('followers_youknow')]); + NEWSBLUR.log(["populate_friends", data, this.profile.get('followers_youknow')]); _.each(['following_youknow', 'following_everybody', 'followers_youknow', 'followers_everybody'], _.bind(function(f) { var user_ids = this.profile.get(f); var $f = $('.NB-profile-'+f.replace('_', '-'), this.$modal); diff --git a/media/js/newsblur/social_page/social_page_login_view.js b/media/js/newsblur/social_page/social_page_login_view.js index 22831ca99..7fa46c112 100644 --- a/media/js/newsblur/social_page/social_page_login_view.js +++ b/media/js/newsblur/social_page/social_page_login_view.js @@ -169,7 +169,7 @@ NEWSBLUR.Views.SocialPageLoginView = Backbone.View.extend({ }, post_login: function(data) { - console.log(["login data", data]); + NEWSBLUR.log(["login data", data]); this.clean(); window.location.href = this.options.story_url; @@ -195,7 +195,7 @@ NEWSBLUR.Views.SocialPageLoginView = Backbone.View.extend({ }, post_signup: function(data) { - console.log(["signup data", data]); + NEWSBLUR.log(["signup data", data]); this.clean(); window.location.href = this.options.story_url; diff --git a/media/js/newsblur/views/feed_list_header_view.js b/media/js/newsblur/views/feed_list_header_view.js index 50c15adc6..9e719d4ed 100644 --- a/media/js/newsblur/views/feed_list_header_view.js +++ b/media/js/newsblur/views/feed_list_header_view.js @@ -24,7 +24,7 @@ NEWSBLUR.Views.FeedListHeader = Backbone.View.extend({ this.count(); } var hide_read_feeds = NEWSBLUR.assets.preference('hide_read_feeds'); - // console.log(["render feed list header", this.collection.length, this.feeds_count, hide_read_feeds]); + // NEWSBLUR.log(["render feed list header", this.collection.length, this.feeds_count, hide_read_feeds]); var $header = _.template('\