scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-29 19:51:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #434 from ZmagoD/zd_SCI_915

Browse source 
Text is deleted when entering smart annotation in rich text editor
This commit is contained in:
Zmago Devetak 2017-01-20 13:01:29 +01:00 committed by GitHub
commit c1e7cc83a7
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/sitewide/atwho_res.js.erb
View file

@ -405,11 +405,11 @@ var SmartAnnotation = (function() {
acceptSpaceBar: true,
displayTimeout: 120000
})
.atwho(atWhoSettings('#', DEFAULT_SEARCH_FILTER))
.atwho(atWhoSettings('task#', FilterTypeEnum.TASK))
.atwho(atWhoSettings('project#', FilterTypeEnum.PROJECT))
.atwho(atWhoSettings('experiment#', FilterTypeEnum.EXPERIMENT))
.atwho(atWhoSettings('sample#', FilterTypeEnum.SAMPLE));
.atwho(atWhoSettings('#', DEFAULT_SEARCH_FILTER));
// .atwho(atWhoSettings('task#', FilterTypeEnum.TASK)) Waiting for better times
// .atwho(atWhoSettings('project#', FilterTypeEnum.PROJECT))
// .atwho(atWhoSettings('experiment#', FilterTypeEnum.EXPERIMENT))
// .atwho(atWhoSettings('sample#', FilterTypeEnum.SAMPLE));
}
return {