aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-01-15 11:38:41 +0100
committerMario <mario@mariovavti.com>2019-01-15 11:38:41 +0100
commit2e94e4cd67e9eb7dd5e42cbd38cc0c4b96d5af3c (patch)
tree5c9315c262bead05067f29f4a3194baacdcf3a22
parenta8a5d2fc4efcc3c38bbde7b5044f5ea38a0f9e89 (diff)
parentc26e112bee8c57c2a9d7d5f6f24ddca8de033c19 (diff)
downloadvolse-hubzilla-2e94e4cd67e9eb7dd5e42cbd38cc0c4b96d5af3c.tar.gz
volse-hubzilla-2e94e4cd67e9eb7dd5e42cbd38cc0c4b96d5af3c.tar.bz2
volse-hubzilla-2e94e4cd67e9eb7dd5e42cbd38cc0c4b96d5af3c.zip
Merge branch 'core_fixes' into 'dev'
Core fixes See merge request hubzilla/core!1470
-rw-r--r--view/js/autocomplete.js2
-rw-r--r--view/js/main.js16
-rw-r--r--view/tpl/notifications_widget.tpl2
3 files changed, 12 insertions, 8 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 6b77f0631..278a0a176 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -216,8 +216,6 @@ function string2bb(element) {
});
textcomplete.register([contacts,forums,smilies,tags]);
});
-
-
};
})( jQuery );
diff --git a/view/js/main.js b/view/js/main.js
index ca9ad8ca4..017d39353 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -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;
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 98047f1d9..bc7f80906 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -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, '');
};
});