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

Fixing an infinite loop (!!) and focusing in on the comment textbox when sharing a story.

Browse source
This commit is contained in:
Samuel Clay 2014-01-16 12:55:44 -08:00
parent 37c909dc16
commit 869027b0fc
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
media/js/newsblur/views/story_save_view.js
View file

@ -213,8 +213,8 @@ NEWSBLUR.Views.StorySaveView = Backbone.View.extend({
}
}
});
} else if (this.sideoptions_view.share_view.is_open) {
this.sideoptions_view.share_view.resize();
} else if (this.sideoptions_view.share_view.is_open && !options.from_share_view) {
this.sideoptions_view.share_view.resize({from_save_view: true});
}
}

16
media/js/newsblur/views/story_share_view.js
View file

@ -70,6 +70,7 @@ NEWSBLUR.Views.StoryShareView = Backbone.View.extend({
// Close
this.is_open = false;
this.resize({close: true});
NEWSBLUR.reader.blur_to_page();
} else {
// Open/resize
this.is_open = true;
@ -104,12 +105,18 @@ NEWSBLUR.Views.StoryShareView = Backbone.View.extend({
this.mark_story_as_shared({'source': 'sideoption'});
}, this);
var $comments = $('.NB-sideoption-share-comments', $share);
$comments.unbind('keydown.story_share')
$comments.unbind('keydown.story_share').unbind('keypress.story_share')
.bind('keydown.story_share', 'ctrl+return', share)
.bind('keydown.story_share', 'meta+return', share);
.bind('keydown.story_share', 'meta+return', share)
.bind('keypress.story_share', 'esc', blur);
$comments.focus();
}
},
blur: function() {
NEWSBLUR.reader.blur_to_page();
},
resize: function(options) {
options = options || {};
var $sideoption_container = this.$('.NB-feed-story-sideoptions-container');
@ -193,8 +200,9 @@ NEWSBLUR.Views.StoryShareView = Backbone.View.extend({
});
} else if (this.sideoptions_view &&
this.sideoptions_view.save_view &&
this.sideoptions_view.save_view.is_open) {
this.sideoptions_view.save_view.resize();
this.sideoptions_view.save_view.is_open &&
!options.from_save_view) {
this.sideoptions_view.save_view.resize({from_share_view: true});
}
}