vmario/wisemapping-frontend
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-frontend.git synced 2024-11-22 14:47:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged in bugfix/undo-delete-and-tooltips (pull request #12)

Browse Source 
Bugfix/undo delete and tooltips

* Fix undo delete: restore NodeModel original-like implementation

* Fix empty tooltips (no text)


Approved-by: Paulo Veiga
This commit is contained in:
Matias Arriola 2021-12-20 21:21:39 +00:00 committed by Paulo Veiga
parent f8156fcf85
commit 60771b2ded
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/mindplot/src/components/model/NodeModel.js
View File

@ -122,7 +122,16 @@ class NodeModel extends INodeModel {
* @return {mindplot.model.NodeModel} an identical clone of the NodeModel * @return {mindplot.model.NodeModel} an identical clone of the NodeModel
*/ */
clone() { clone() {
return cloneDeep(this); const result = new NodeModel(this.getType(), this._mindmap);
result._children = this._children.map((node) => {
const cnode = node.clone();
cnode._parent = result;
return cnode;
});
result._properties = cloneDeep(this._properties);
result._feature = cloneDeep(this._feature);
return result;
} }
/** /**

9
packages/mindplot/src/components/widget/KeyboardShortcutTooltip.js
View File

@ -31,20 +31,19 @@ class KeyboardShortcutTooltip extends FloatingTip {
buttonElem.append(tipDiv); buttonElem.append(tipDiv);
super(tipDiv, { super(tipDiv, {
// Content can also be a function of the target element! // content can be a function or string
content: KeyboardShortcutTooltip._buildContent(), content: KeyboardShortcutTooltip._buildContent(text),
html: true, html: true,
placement: 'bottom', placement: 'bottom',
className: 'keyboardShortcutTip', className: 'keyboardShortcutTip',
template: '<div class="popover popoverBlack" role="tooltip"><div class="arrow arrowBlack"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>', template: '<div class="popover popoverBlack" role="tooltip"><div class="arrow arrowBlack"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>',
}); });
this._text = text;
tipDiv.on('click', (e) => { tipDiv.on('click', (e) => {
tipDiv.trigger('mouseleave', e); tipDiv.trigger('mouseleave', e);
}); });
} }
static _buildContent() { static _buildContent(text) {
const result = $('<div></div>'); const result = $('<div></div>');
result.css({ result.css({
padding: '3px 0px', padding: '3px 0px',
@ -52,7 +51,7 @@ class KeyboardShortcutTooltip extends FloatingTip {
color: 'white', color: 'white',
}); });
const textContainer = $('<div></div>').text(this._text); const textContainer = $('<div></div>').text(text);
textContainer.css({ textContainer.css({
width: '100%', width: '100%',
'font-size': '90%', 'font-size': '90%',