Skip to content

Commit 74b6ae0

Browse files
committed
improve writer view
1 parent a1bf98e commit 74b6ae0

File tree

2 files changed

+22
-6
lines changed

2 files changed

+22
-6
lines changed

src/js/modules/viewports/writing_board_viewport/writing_board_viewport.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var setCurrentTags = function () {
1818
var instancesRepo = createInstancesManagement()
1919
var instances = instancesRepo.getAll()
2020

21-
return instances.map(i=>({id:i.uuid, tag:i.name}))
21+
return instances.map(i=>({id:i.uuid, tag:i.name, icon:"./img/icons/"+i.iconPath}))
2222
}
2323

2424
var getEvaluatorData = function (event, data, instance){
@@ -168,7 +168,7 @@ var updateTable = function (event, data, instance) {
168168
console.log(editor.otherEntries);
169169

170170
editor.mentionsDefs= [
171-
{name:"hashtag", key:"#", attributes:["id", "tag"], attributeToDisplay:'tag'},
171+
{name:"hashtag", key:"#", attributes:["id", "tag"], attributeToDisplay:'tag', imageAttributes:"icon"},
172172
{name:"mention", key:"@", attributes:["name", "id","email"], attributeToDisplay:'name'},
173173
{name:"arrow", key:"->", attributes:["id","tag"], attributeToDisplay:'tag'},
174174
]
@@ -191,7 +191,11 @@ var updateTable = function (event, data, instance) {
191191
}
192192

193193
var setUpTable = function (event, data, instance) {
194-
updateTable(event, data, instance)
194+
updateTable(event, data, instance)
195+
setTimeout(function(){
196+
updateTableInstance(event, data, instance)// if use current is activated
197+
}, 500)
198+
195199
// subscribeToChanges(event, data, instance, updateTable)
196200
subscribeToSearchParam(event, data, instance, updateTableInstance)
197201
}

src/js/vendor/writer/mention/defaultPlugin.js

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,21 @@ export var getDefaultMentionPlugin = function (defs, lists, callbacks) {
77

88
}
99

10-
var getTagSuggestionsHTML = (items,type) => '<div class="suggestion-item-list">'+
11-
items.map(i => '<div class="suggestion-item">'+i[defsMap[type].attributeToDisplay]+'</div>').join('')+
12-
'</div>';
10+
// var getTagSuggestionsHTML = (items,type) => '<div class="suggestion-item-list">'+
11+
// items.map(i => '<div class="suggestion-item">'+i[defsMap[type].attributeToDisplay]+'</div>').join('')+
12+
// '</div>';
13+
var getTagSuggestionsHTML = function (items,type) {
14+
if (defsMap[type].imageAttributes) {
15+
return '<div class="suggestion-item-list">'+
16+
items.map(i => '<div class="suggestion-item"><img style="height: 18px; margin-right: 6px;" src="'+i[defsMap[type].imageAttributes]+'">'+i[defsMap[type].attributeToDisplay]+'</div>').join('')+
17+
'</div>';
18+
}else{
19+
return '<div class="suggestion-item-list">'+
20+
items.map(i => '<div class="suggestion-item">'+i[defsMap[type].attributeToDisplay]+'</div>').join('')+
21+
'</div>';
22+
}
23+
24+
}
1325

1426
/**
1527
* IMPORTANT: outer div's "suggestion-item-list" class is mandatory. The plugin uses this class for querying.

0 commit comments

Comments
 (0)