From 009a59006e6400cb76184f5bcfd32dff5dbcaf92 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Tue, 14 Jul 2020 17:30:35 -0400 Subject: [PATCH] Adding preference to turn off highlighter. --- .../js/newsblur/reader/reader_preferences.js | 22 +++++++++++++++++++ media/js/newsblur/views/story_detail_view.js | 2 ++ templates/base.html | 3 ++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/media/js/newsblur/reader/reader_preferences.js b/media/js/newsblur/reader/reader_preferences.js index 1740172b3..fc5d9b768 100644 --- a/media/js/newsblur/reader/reader_preferences.js +++ b/media/js/newsblur/reader/reader_preferences.js @@ -28,6 +28,7 @@ _.extend(NEWSBLUR.ReaderPreferences.prototype, { this.original_preferences = this.serialize_preferences(); this.$modal.bind('click', $.rescope(this.handle_click, this)); + this.$modal.bind('click', $.rescope(this.handle_click, this)); }, make_modal: function() { @@ -795,6 +796,21 @@ _.extend(NEWSBLUR.ReaderPreferences.prototype, { $.make('div', { className: 'NB-preference-label'}, [ 'Story button placement' ]) + ]), + $.make('div', { className: 'NB-preference NB-preference-highlights' }, [ + $.make('div', { className: 'NB-preference-options' }, [ + $.make('div', [ + $.make('input', { id: 'NB-preference-highlights-1', type: 'radio', name: 'highlights', value: 'true' }), + $.make('label', { 'for': 'NB-preference-highlights-1' }, 'Show highlighter when selecting text') + ]), + $.make('div', [ + $.make('input', { id: 'NB-preference-highlights-2', type: 'radio', name: 'highlights', value: 'false' }), + $.make('label', { 'for': 'NB-preference-highlights-2' }, 'Disable the highlighter') + ]) + ]), + $.make('div', { className: 'NB-preference-label'}, [ + 'Enable highlighting' + ]) ]) ]), $.make('div', { className: 'NB-tab NB-tab-keyboard' }, [ @@ -1130,6 +1146,12 @@ _.extend(NEWSBLUR.ReaderPreferences.prototype, { return false; } }); + $('input[name=highlights]', $modal).each(function() { + if ($(this).val() == ""+NEWSBLUR.Preferences.highlights) { + $(this).attr('checked', true); + return false; + } + }); $('input[name=keyboard_verticalarrows]', $modal).each(function() { if ($(this).val() == NEWSBLUR.Preferences.keyboard_verticalarrows) { $(this).attr('checked', true); diff --git a/media/js/newsblur/views/story_detail_view.js b/media/js/newsblur/views/story_detail_view.js index be2e03713..443eeadcc 100644 --- a/media/js/newsblur/views/story_detail_view.js +++ b/media/js/newsblur/views/story_detail_view.js @@ -725,6 +725,8 @@ NEWSBLUR.Views.StoryDetailView = Backbone.View.extend({ return; } + if (!NEWSBLUR.assets.preference('highlights')) return; + this.$(".NB-starred-story-selection-highlight,[data-tippy]").contents().unwrap(); $doc.attr('id', 'NB-highlighting'); diff --git a/templates/base.html b/templates/base.html index f94c40c4f..d44159743 100644 --- a/templates/base.html +++ b/templates/base.html @@ -93,7 +93,8 @@ 'story_share_readitlater' : false, 'story_share_instapaper' : true, 'story_share_email' : true, - 'theme' : 'auto' + 'theme' : 'auto', + 'highlights' : true }; NEWSBLUR.URLs = { 'upload-avatar' : "{% url "upload-avatar" %}",