public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing multiple highlights. Seems to work!

Browse source
This commit is contained in:
Samuel Clay 2018-08-09 16:36:17 -04:00
parent 1c7c734662
commit 92626bb7da
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
media/js/newsblur/views/story_detail_view.js
View file

@ -716,16 +716,18 @@ NEWSBLUR.Views.StoryDetailView = Backbone.View.extend({
mouseup_check_selection: function() { mouseup_check_selection: function() {
rangy.init(); rangy.init();
var $doc = this.$(".NB-feed-story-content"); var $doc = this.$(".NB-feed-story-content");
var highlighter = rangy.createHighlighter(); this.highlighter = this.highlighter || rangy.createHighlighter();
highlighter.addClassApplier(rangy.createClassApplier("NB-starred-story-selection-highlight")); this.highlighter.addClassApplier(rangy.createClassApplier("NB-starred-story-selection-highlight"));
$doc.attr('id', 'NB-highlighting'); $doc.attr('id', 'NB-highlighting');
console.log(['highlighting pre', highlighter.serialize()]); this.highlighter.highlightSelection("NB-starred-story-selection-highlight", {
highlighter.highlightSelection("NB-starred-story-selection-highlight", {
containerElementId: "NB-highlighting" containerElementId: "NB-highlighting"
}); });
$doc.removeAttr('id'); $doc.removeAttr('id');
console.log(['highlighting post', highlighter.serialize()]); rangy.getSelection().removeAllRanges();
this.model.set('highlights', highlighter.serialize());
console.log(['highlighting', this.highlighter.serialize()]);
this.model.set('highlights', this.highlighter.serialize());
this.model.update_highlights(); this.model.update_highlights();
this.apply_starred_story_selections(); this.apply_starred_story_selections();
@ -737,13 +739,13 @@ NEWSBLUR.Views.StoryDetailView = Backbone.View.extend({
rangy.init(); rangy.init();
console.log(['apply_starred_story_selections', this.model.get('highlights')]); console.log(['apply_starred_story_selections', this.model.get('highlights')]);
var $doc = this.$(".NB-feed-story-content"); var $doc = this.$(".NB-feed-story-content");
var highlighter = rangy.createHighlighter(); this.highlighter = this.highlighter || rangy.createHighlighter();
highlighter.addClassApplier(rangy.createClassApplier("NB-starred-story-selection-highlight")); this.highlighter.addClassApplier(rangy.createClassApplier("NB-starred-story-selection-highlight"));
$doc.attr('id', 'NB-highlighting'); $doc.attr('id', 'NB-highlighting');
var highlights = this.model.get('highlights'); var highlights = this.model.get('highlights');
if (!highlights) return; if (!highlights) return;
console.log(['highlights', highlights]); console.log(['highlights', highlights]);
highlighter.deserialize(highlights); this.highlighter.deserialize(highlights);
$doc.removeAttr('id'); $doc.removeAttr('id');
}, },