Resolve feedback.
This commit is contained in:
parent
1595047777
commit
32e31d626f
|
@ -149,6 +149,11 @@
|
|||
|
||||
if (activeTab === 'notes') {
|
||||
$target = $target.closest('.note-discussion');
|
||||
|
||||
// If the next discussion is closed, toggle it open.
|
||||
if ($target.find('.js-toggle-content').is(':hidden')) {
|
||||
$target.find('.js-toggle-button i').trigger('click')
|
||||
}
|
||||
} else if (activeTab === 'diffs') {
|
||||
// Resolved discussions are hidden in the diffs tab by default.
|
||||
// If they are marked unresolved on the notes tab, they will still be hidden on the diffs tab.
|
||||
|
@ -176,12 +181,6 @@
|
|||
$.scrollTo($target, {
|
||||
offset: -($('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight())
|
||||
});
|
||||
|
||||
// If the next discussion is closed, toggle it open.
|
||||
if ($target.find(".js-toggle-content").attr('style') == "display: none;") {
|
||||
$target.find('.js-toggle-button i').toggleClass('fa fa-chevron-down').toggleClass('fa fa-chevron-up');
|
||||
$target.find(".js-toggle-content").toggle();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
@ -1,9 +1,7 @@
|
|||
- discussion = local_assigns.fetch(:discussion, nil)
|
||||
- if current_user
|
||||
%jump-to-discussion{ "inline-template" => true, ":discussion-id" => "'#{discussion.try(:id)}'" }
|
||||
.btn-group{ role: "group",
|
||||
"v-show" => "!allResolved",
|
||||
"v-if" => "showButton" }
|
||||
.btn-group{ role: "group", "v-show" => "!allResolved", "v-if" => "showButton" }
|
||||
%button.btn.btn-default.discussion-next-btn.has-tooltip{ "@click" => "jumpToNextUnresolvedDiscussion",
|
||||
title: "Jump to next unresolved discussion",
|
||||
"aria-label" => "Jump to next unresolved discussion",
|
||||
|
|
10
db/schema.rb
10
db/schema.rb
|
@ -652,6 +652,16 @@ ActiveRecord::Schema.define(version: 20160810142633) do
|
|||
add_index "namespaces", ["path"], name: "index_namespaces_on_path_trigram", using: :gin, opclasses: {"path"=>"gin_trgm_ops"}
|
||||
add_index "namespaces", ["type"], name: "index_namespaces_on_type", using: :btree
|
||||
|
||||
create_table "note_templates", force: :cascade do |t|
|
||||
t.integer "user_id"
|
||||
t.string "title"
|
||||
t.text "note"
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
end
|
||||
|
||||
add_index "note_templates", ["user_id"], name: "index_note_templates_on_user_id", using: :btree
|
||||
|
||||
create_table "notes", force: :cascade do |t|
|
||||
t.text "note"
|
||||
t.string "noteable_type"
|
||||
|
|
Loading…
Reference in New Issue