harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'core_fixes' into 'dev'

Browse Source 
Core fixes

See merge request hubzilla/core!1470
This commit is contained in:
Mario 2019-01-15 11:38:41 +01:00
commit 2e94e4cd67
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
view/js/autocomplete.js
View File

@ -216,8 +216,6 @@ function string2bb(element) {
});
textcomplete.register([contacts,forums,smilies,tags]);
});
};
})( jQuery );

16
view/js/main.js
View File

@ -44,6 +44,17 @@ $(document).ready(function() {
$(document).on('click', '.conversation-settings-link', getConversationSettings);
$(document).on('click', '#settings_module_ajax_submit', postConversationSettings);
$(document).on('click focus', '.comment-edit-form textarea', function(e) {
if(! this.autocomplete_handled) {
/* autocomplete @nicknames */
$(this).editor_autocomplete(baseurl+"/acl?f=&n=1");
/* autocomplete bbcode */
$(this).bbco_autocomplete('bbcode');
this.autocomplete_handled = true;
}
});
var tf = new Function('n', 's', 'var k = s.split("/")['+aStr['plural_func']+']; return (k ? k : s);');
jQuery.timeago.settings.strings = {
@ -755,11 +766,6 @@ function updateConvItems(mode,data) {
mediaPlaying = false;
});
/* autocomplete @nicknames */
$(".comment-edit-form textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
/* autocomplete bbcode */
$(".comment-edit-form textarea").bbco_autocomplete('bbcode');
var bimgs = ((preloadImages) ? false : $(".wall-item-body img").not(function() { return this.complete; }));
var bimgcount = bimgs.length;

2
view/tpl/notifications_widget.tpl
View File

@ -24,7 +24,7 @@
});
window.onpopstate = function(e) {
if(e.state !== null)
if(e.state !== null && e.state.b64mid !== bParam_mid)
getData(e.state.b64mid, '');
};
});