From beb33f2577567595650f66f04200961a8a05247c Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Thu, 28 Nov 2024 14:45:41 -0500 Subject: [PATCH] Moving NEWSBLUR.Collections.DiscoverStories to its proper place. --- media/css/reader/reader.css | 2 +- media/js/newsblur/models/discover_stories.js | 16 ++ media/js/newsblur/models/stories.js | 17 -- newsblur_web/assets.yml | 278 +++++++++---------- 4 files changed, 156 insertions(+), 157 deletions(-) diff --git a/media/css/reader/reader.css b/media/css/reader/reader.css index 0542116e7..d34665d1c 100644 --- a/media/css/reader/reader.css +++ b/media/css/reader/reader.css @@ -4544,7 +4544,7 @@ body { .NB-story-content-container { overflow: hidden; position: relative; - min-height: 192px; + min-height: 258px; background-color: white; } diff --git a/media/js/newsblur/models/discover_stories.js b/media/js/newsblur/models/discover_stories.js index e69de29bb..2e1205689 100644 --- a/media/js/newsblur/models/discover_stories.js +++ b/media/js/newsblur/models/discover_stories.js @@ -0,0 +1,16 @@ +NEWSBLUR.Collections.DiscoverStories = NEWSBLUR.Collections.Stories.extend({ + + url: function () { + var url = '/rss_feeds/discover/stories/' + this.similar_to_story_hash + '/'; + if (this.feed_ids && this.feed_ids.length > 0) { + url += '?feed_id=' + this.feed_ids.join("&feed_id="); + } + + return url; + }, + + parse: function (response) { + return response.discover_stories; + } + +}); diff --git a/media/js/newsblur/models/stories.js b/media/js/newsblur/models/stories.js index b07a804e8..ac4b7ffa2 100644 --- a/media/js/newsblur/models/stories.js +++ b/media/js/newsblur/models/stories.js @@ -719,20 +719,3 @@ NEWSBLUR.Collections.Stories = Backbone.Collection.extend({ } }); - -NEWSBLUR.Collections.DiscoverStories = NEWSBLUR.Collections.Stories.extend({ - - url: function () { - var url = '/rss_feeds/discover/stories/' + this.similar_to_story_hash + '/'; - if (this.feed_ids && this.feed_ids.length > 0) { - url += '?feed_id=' + this.feed_ids.join("&feed_id="); - } - - return url; - }, - - parse: function (response) { - return response.discover_stories; - } - -}); diff --git a/newsblur_web/assets.yml b/newsblur_web/assets.yml index 6ed28cb3c..05b0625ac 100644 --- a/newsblur_web/assets.yml +++ b/newsblur_web/assets.yml @@ -8,14 +8,14 @@ compressor_options: # YUI for CSS (not cssmin) css_compressor: yui -# Compile JavaScript templates (JSTs) and wrap with this Underscore.js +# Compile JavaScript templates (JSTs) and wrap with this Underscore.js # micro-templating string function. template_function: _.template # Location of static assets relative to CWD. public_root: /srv/newsblur/ -# Package data-uri and mhtml variants of stylesheets, with whitelisted +# Package data-uri and mhtml variants of stylesheets, with whitelisted # images embedded inline. embed_assets: datauri @@ -24,143 +24,143 @@ embed_assets: datauri # for testing. compress_assets: on - javascripts: - common: - - js/vendor/jquery-3.6.0.min.js - # - js/vendor/jquery.migrate-*.js - - js/vendor/jquery.browser.js - - js/vendor/jquery.json.js - - js/vendor/jquery.easing.js - - js/vendor/jquery.newsblur.js - - js/vendor/jquery.scrollTo.js - - js/vendor/jquery.corners.js - - js/vendor/jquery.hotkeys.js - - js/vendor/jquery.ajaxupload.js - - js/vendor/jquery.ajaxmanager.3.js - - js/vendor/jquery.simplemodal-1.4.js - - js/vendor/jquery.color.js - - js/vendor/jquery.wakeup.js - - js/vendor/jquery-ui-1.13.1.js - - js/vendor/jquery.cookie.js - - js/vendor/jquery.layout.js - - js/vendor/jquery.tinysort.js - - js/vendor/jquery.fieldselection.js - - js/vendor/jquery.tipsy.js - - js/vendor/tippy-*.js - - js/vendor/jquery.autosize.js - - js/vendor/jquery.chosen.js - - js/vendor/jquery.effects.core.js - - js/vendor/jquery.effects.slideOffscreen.js - - js/vendor/date.format.js - - js/vendor/tag-it.js - - js/vendor/chart.js - - js/vendor/push.js - - js/vendor/socket.io-client.*.js - - js/vendor/inflector.js - - js/vendor/underscore-*.js - - js/vendor/underscore.string.js - - js/vendor/backbone-*.js - - js/vendor/bootstrap-transition.js - - js/vendor/highlight.js - - js/vendor/fitvid.js - - js/vendor/il.js - - js/vendor/mark.js - - js/newsblur/reader/reader_utils.js - - js/newsblur/reader/reader.js - - js/newsblur/reader/reader_popover.js - - js/newsblur/common/*.js - - js/newsblur/models/*.js - - js/newsblur/views/*.js - - js/newsblur/reader/*.js - - js/newsblur/welcome/*.js - # mobile: - # - js/vendor/jquery-3.5.1.js - # - js/mobile/jquery.mobile-1.0b1.js - # - js/vendor/jquery.ajaxmanager.3.js - # - js/vendor/underscore-*.js - # - js/vendor/underscore.string.js - # - js/vendor/inflector.js - # - js/vendor/jquery.json.js - # - js/vendor/jquery.easing.js - # - js/vendor/jquery.newsblur.js - # - js/vendor/backbone-*.js - # - js/newsblur/reader/reader_utils.js - # - js/newsblur/models/*.js - # - js/newsblur/common/assetmodel.js - # - js/mobile/newsblur/mobile_workspace.js - statistics: - - js/vendor/jquery-3.6.0.min.js - - js/vendor/jquery.newsblur.js - - js/vendor/jquery.simplemodal-1.3.js - - js/vendor/inflector.js - - js/vendor/underscore-*.js - - js/vendor/backbone-*.js - - js/vendor/chart.js - - js/newsblur/common/modal.js - - js/newsblur/reader/reader_statistics.js - - js/newsblur/reader/reader_utils.js - - js/newsblur/models/feeds.js - payments: - - js/newsblur/payments/paypal_return.js - - js/newsblur/payments/stripe_form.js - bookmarklet: - - js/vendor/jquery-3.6.0.min.js - - js/vendor/jquery.noConflict.js - - js/vendor/jquery.browser.js - - js/vendor/jquery.newsblur.js - - js/vendor/jquery.tinysort.js - - js/vendor/jquery.simplemodal-1.4.js - - js/vendor/jquery.corners.js - - js/vendor/jquery.hotkeys.js - - js/vendor/jquery.easing.js - - js/vendor/jquery.url.js - - js/vendor/underscore-*.js - - js/vendor/underscore.noconflict.js - - js/vendor/readability-*.js - blurblog: - - js/vendor/jquery-3.6.0.js - - js/vendor/jquery.browser.js - - js/vendor/jquery.color.js - - js/vendor/underscore-*.js - - js/vendor/underscore.string.js - - js/vendor/backbone-*.js - - js/vendor/jquery.tipsy.js - - js/vendor/inflector.js - - js/vendor/bootstrap-tooltip.js - - js/vendor/bootstrap-*.js - - js/vendor/bootstrapx-*.js - - js/newsblur/social_page/*.js - - js/newsblur/models/comments.js - - js/newsblur/views/story_share_view.js - - js/newsblur/views/story_comment_view.js - - js/vendor/jquery.easing.js - - js/vendor/jquery.newsblur.js - - js/vendor/jquery.scrollTo.js - - js/vendor/jquery.hotkeys.js + common: + - js/vendor/jquery-3.6.0.min.js + # - js/vendor/jquery.migrate-*.js + - js/vendor/jquery.browser.js + - js/vendor/jquery.json.js + - js/vendor/jquery.easing.js + - js/vendor/jquery.newsblur.js + - js/vendor/jquery.scrollTo.js + - js/vendor/jquery.corners.js + - js/vendor/jquery.hotkeys.js + - js/vendor/jquery.ajaxupload.js + - js/vendor/jquery.ajaxmanager.3.js + - js/vendor/jquery.simplemodal-1.4.js + - js/vendor/jquery.color.js + - js/vendor/jquery.wakeup.js + - js/vendor/jquery-ui-1.13.1.js + - js/vendor/jquery.cookie.js + - js/vendor/jquery.layout.js + - js/vendor/jquery.tinysort.js + - js/vendor/jquery.fieldselection.js + - js/vendor/jquery.tipsy.js + - js/vendor/tippy-*.js + - js/vendor/jquery.autosize.js + - js/vendor/jquery.chosen.js + - js/vendor/jquery.effects.core.js + - js/vendor/jquery.effects.slideOffscreen.js + - js/vendor/date.format.js + - js/vendor/tag-it.js + - js/vendor/chart.js + - js/vendor/push.js + - js/vendor/socket.io-client.*.js + - js/vendor/inflector.js + - js/vendor/underscore-*.js + - js/vendor/underscore.string.js + - js/vendor/backbone-*.js + - js/vendor/bootstrap-transition.js + - js/vendor/highlight.js + - js/vendor/fitvid.js + - js/vendor/il.js + - js/vendor/mark.js + - js/newsblur/reader/reader_utils.js + - js/newsblur/reader/reader.js + - js/newsblur/reader/reader_popover.js + - js/newsblur/common/*.js + - js/newsblur/models/stories.js + - js/newsblur/models/*.js + - js/newsblur/views/*.js + - js/newsblur/reader/*.js + - js/newsblur/welcome/*.js + # mobile: + # - js/vendor/jquery-3.5.1.js + # - js/mobile/jquery.mobile-1.0b1.js + # - js/vendor/jquery.ajaxmanager.3.js + # - js/vendor/underscore-*.js + # - js/vendor/underscore.string.js + # - js/vendor/inflector.js + # - js/vendor/jquery.json.js + # - js/vendor/jquery.easing.js + # - js/vendor/jquery.newsblur.js + # - js/vendor/backbone-*.js + # - js/newsblur/reader/reader_utils.js + # - js/newsblur/models/*.js + # - js/newsblur/common/assetmodel.js + # - js/mobile/newsblur/mobile_workspace.js + statistics: + - js/vendor/jquery-3.6.0.min.js + - js/vendor/jquery.newsblur.js + - js/vendor/jquery.simplemodal-1.3.js + - js/vendor/inflector.js + - js/vendor/underscore-*.js + - js/vendor/backbone-*.js + - js/vendor/chart.js + - js/newsblur/common/modal.js + - js/newsblur/reader/reader_statistics.js + - js/newsblur/reader/reader_utils.js + - js/newsblur/models/feeds.js + payments: + - js/newsblur/payments/paypal_return.js + - js/newsblur/payments/stripe_form.js + bookmarklet: + - js/vendor/jquery-3.6.0.min.js + - js/vendor/jquery.noConflict.js + - js/vendor/jquery.browser.js + - js/vendor/jquery.newsblur.js + - js/vendor/jquery.tinysort.js + - js/vendor/jquery.simplemodal-1.4.js + - js/vendor/jquery.corners.js + - js/vendor/jquery.hotkeys.js + - js/vendor/jquery.easing.js + - js/vendor/jquery.url.js + - js/vendor/underscore-*.js + - js/vendor/underscore.noconflict.js + - js/vendor/readability-*.js + blurblog: + - js/vendor/jquery-3.6.0.js + - js/vendor/jquery.browser.js + - js/vendor/jquery.color.js + - js/vendor/underscore-*.js + - js/vendor/underscore.string.js + - js/vendor/backbone-*.js + - js/vendor/jquery.tipsy.js + - js/vendor/inflector.js + - js/vendor/bootstrap-tooltip.js + - js/vendor/bootstrap-*.js + - js/vendor/bootstrapx-*.js + - js/newsblur/social_page/*.js + - js/newsblur/models/comments.js + - js/newsblur/views/story_share_view.js + - js/newsblur/views/story_comment_view.js + - js/vendor/jquery.easing.js + - js/vendor/jquery.newsblur.js + - js/vendor/jquery.scrollTo.js + - js/vendor/jquery.hotkeys.js stylesheets: - common: - - css/reader/reader.css - - css/controls/*.css - - css/pages/*.css - - css/reader/modals.css - - css/reader/status.css - - css/reader/darkmode.css - - css/jquery-ui/jquery-ui.theme.css - - css/jquery-ui/jquery-ui.structure.css - - css/jquery.tipsy.css - - css/vendor/bootstrap-progressbar.css - - css/vendor/jquery.tagit.css - - css/vendor/highlight.css - # mobile: - # - css/mobile/jquery.mobile-1.0b1.css - # - css/mobile/mobile.css - bookmarklet: - - css/bookmarklet/reset.css - - css/reader/modals.css - - css/bookmarklet/bookmarklet.css - blurblog: - - css/controls/jquery.tipsy.css - - css/vendor/bootstrap-*.css - - css/circular/css/social_page.css + common: + - css/reader/reader.css + - css/controls/*.css + - css/pages/*.css + - css/reader/modals.css + - css/reader/status.css + - css/reader/darkmode.css + - css/jquery-ui/jquery-ui.theme.css + - css/jquery-ui/jquery-ui.structure.css + - css/jquery.tipsy.css + - css/vendor/bootstrap-progressbar.css + - css/vendor/jquery.tagit.css + - css/vendor/highlight.css + # mobile: + # - css/mobile/jquery.mobile-1.0b1.css + # - css/mobile/mobile.css + bookmarklet: + - css/bookmarklet/reset.css + - css/reader/modals.css + - css/bookmarklet/bookmarklet.css + blurblog: + - css/controls/jquery.tipsy.css + - css/vendor/bootstrap-*.css + - css/circular/css/social_page.css