mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-21 07:26:15 +08:00
Fixes merge conflicts with smart-annotations branch
This commit is contained in:
parent
f1483e4cad
commit
365eef506c
|
@ -185,12 +185,8 @@ function formCallback($form) {
|
|||
|
||||
setTimeout(function() {
|
||||
initStepsComments();
|
||||
<<<<<<< HEAD
|
||||
openLinksInNewTab();
|
||||
animateSpinner(null, false);
|
||||
=======
|
||||
SmartAnnotation.preventPropagation('.atwho-user-popover');
|
||||
>>>>>>> smart-annotations
|
||||
}, 1000);
|
||||
return true;
|
||||
});
|
||||
|
@ -281,12 +277,9 @@ function formNewAjax($form) {
|
|||
formCallback($form);
|
||||
formNewAjax($form);
|
||||
applyCancelOnNew();
|
||||
<<<<<<< HEAD
|
||||
animateSpinner(null, false);
|
||||
=======
|
||||
TinyMCE.destroyAll();
|
||||
SmartAnnotation.preventPropagation('.atwho-user-popover');
|
||||
>>>>>>> smart-annotations
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -340,7 +340,7 @@ var SmartAnnotation = (function() {
|
|||
} else {
|
||||
callback(data.users);
|
||||
}
|
||||
initDismissButton();
|
||||
initDismissButton($('.atwho-view[style]'));
|
||||
}
|
||||
);
|
||||
},
|
||||
|
|
Loading…
Reference in a new issue