Skip to content

C
coopwire-hypothesis
Commit 0107ca51 authored by Robert Knight's avatar Robert Knight Committed by GitHub
Browse files
Options

Merge pull request #71 from hypothesis/remove-selectiontabs-flag 

Remove the 'selection_tabs' feature flag
parents a81eadb3 b9b099b7
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
h/static/scripts/root-thread.js
View file @ 0107ca51
...@@ -59,7 +59,7 @@ function RootThread($rootScope, annotationUI, features, searchFilter, viewFilter ...@@ -59,7 +59,7 @@ function RootThread($rootScope, annotationUI, features, searchFilter, viewFilter
} }
var threadFilterFn; var threadFilterFn;
if (features.flagEnabled('selection_tabs') && !state.filterQuery && state.selectedTab) { if (!state.filterQuery && state.selectedTab) {
if (!features.flagEnabled('orphans_tab')) { if (!features.flagEnabled('orphans_tab')) {
threadFilterFn = function (thread) { threadFilterFn = function (thread) {
if (state.selectedTab === uiConstants.TAB_ANNOTATIONS || state.selectedTab === uiConstants.TAB_ORPHANS) { if (state.selectedTab === uiConstants.TAB_ANNOTATIONS || state.selectedTab === uiConstants.TAB_ORPHANS) {
......
h/templates/client/viewer.html
View file @ 0107ca51
<selection-tabs ng-if="feature('selection_tabs') && <selection-tabs
!search.query() && ng-if="!search.query() && selectedAnnotationCount() === 0"
selectedAnnotationCount() === 0"
is-waiting-to-anchor-annotations="waitingToAnchorAnnotations" is-waiting-to-anchor-annotations="waitingToAnchorAnnotations"
is-loading="isLoading" is-loading="isLoading"
selected-tab="selectedTab" selected-tab="selectedTab"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment