Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
coopwire-hypothesis
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
孙灵跃 Leon Sun
coopwire-hypothesis
Commits
0107ca51
Commit
0107ca51
authored
Aug 05, 2016
by
Robert Knight
Committed by
GitHub
Aug 05, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #71 from hypothesis/remove-selectiontabs-flag
Remove the 'selection_tabs' feature flag
parents
a81eadb3
b9b099b7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
root-thread.js
h/static/scripts/root-thread.js
+1
-1
viewer.html
h/templates/client/viewer.html
+2
-3
No files found.
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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment