scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes merge conflicts with smart-annotations branch

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2017-01-24 15:20:50 +01:00
parent f1483e4cad
commit 365eef506c
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/protocols/steps.js.erb
View file

@ -185,12 +185,8 @@ function formCallback($form) {
setTimeout(function() { setTimeout(function() {
initStepsComments(); initStepsComments();
<<<<<<< HEAD
openLinksInNewTab();
animateSpinner(null, false); animateSpinner(null, false);
=======
SmartAnnotation.preventPropagation('.atwho-user-popover'); SmartAnnotation.preventPropagation('.atwho-user-popover');
>>>>>>> smart-annotations
}, 1000); }, 1000);
return true; return true;
}); });
@ -281,12 +277,9 @@ function formNewAjax($form) {
formCallback($form); formCallback($form);
formNewAjax($form); formNewAjax($form);
applyCancelOnNew(); applyCancelOnNew();
<<<<<<< HEAD
animateSpinner(null, false); animateSpinner(null, false);
=======
TinyMCE.destroyAll(); TinyMCE.destroyAll();
SmartAnnotation.preventPropagation('.atwho-user-popover'); SmartAnnotation.preventPropagation('.atwho-user-popover');
>>>>>>> smart-annotations
}); });
} }

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

@ -336,11 +336,11 @@ var SmartAnnotation = (function() {
{query: query}, {query: query},
function(data) { function(data) {
if (data.users.length < 1) { if (data.users.length < 1) {
callback([{no_results: 1}]); callback([{no_results: 1}]);
} else { } else {
callback(data.users); callback(data.users);
} }
initDismissButton(); initDismissButton($('.atwho-view[style]'));
} }
); );
}, },