diff --git a/js/util.js b/js/util.js
index 2165957c3b..879bb38aec 100644
--- a/js/util.js
+++ b/js/util.js
@@ -81,32 +81,6 @@ $(document).ready(function(){
// XXX: refactor this code
- var favoptions = { dataType: 'xml',
- beforeSubmit: function(data, target, options) {
- $(target).addClass('processing');
- return true;
- },
- success: function(xml) { var new_form = document._importNode($('form', xml).get(0), true);
- var dis = new_form.id;
- var fav = dis.replace('disfavor', 'favor');
- $('form#'+fav).replaceWith(new_form);
- $('form#'+dis).ajaxForm(disoptions).each(addAjaxHidden);
- }
- };
-
- var disoptions = { dataType: 'xml',
- beforeSubmit: function(data, target, options) {
- $(target).addClass('processing');
- return true;
- },
- success: function(xml) { var new_form = document._importNode($('form', xml).get(0), true);
- var fav = new_form.id;
- var dis = fav.replace('favor', 'disfavor');
- $('form#'+dis).replaceWith(new_form);
- $('form#'+fav).ajaxForm(favoptions).each(addAjaxHidden);
- }
- };
-
var joinoptions = { dataType: 'xml',
success: function(xml) { var new_form = document._importNode($('form', xml).get(0), true);
var leave = new_form.id;
@@ -125,20 +99,8 @@ $(document).ready(function(){
}
};
- function addAjaxHidden() {
- var ajax = document.createElement('input');
- ajax.setAttribute('type', 'hidden');
- ajax.setAttribute('name', 'ajax');
- ajax.setAttribute('value', 1);
- this.appendChild(ajax);
- }
-
- $("form.form_favor").ajaxForm(favoptions);
- $("form.form_disfavor").ajaxForm(disoptions);
$("form.form_group_join").ajaxForm(joinoptions);
$("form.form_group_leave").ajaxForm(leaveoptions);
- $("form.form_favor").each(addAjaxHidden);
- $("form.form_disfavor").each(addAjaxHidden);
$("form.form_group_join").each(addAjaxHidden);
$("form.form_group_leave").each(addAjaxHidden);
@@ -252,6 +214,7 @@ $(document).ready(function(){
$('#'+li.id).fadeIn(2500);
NoticeReply();
NoticeAttachments();
+ NoticeFavors();
}
}
$("#notice_data-text").val("");
@@ -270,8 +233,52 @@ $(document).ready(function(){
NoticeReply();
NoticeAttachments();
NoticeDataAttach();
+ NoticeFavors();
});
+function addAjaxHidden() {
+ var ajax = document.createElement('input');
+ ajax.setAttribute('type', 'hidden');
+ ajax.setAttribute('name', 'ajax');
+ ajax.setAttribute('value', 1);
+ this.appendChild(ajax);
+}
+
+function NoticeFavors() {
+
+ // XXX: refactor this code
+ var favoptions = { dataType: 'xml',
+ beforeSubmit: function(data, target, options) {
+ $(target).addClass('processing');
+ return true;
+ },
+ success: function(xml) { var new_form = document._importNode($('form', xml).get(0), true);
+ var dis = new_form.id;
+ var fav = dis.replace('disfavor', 'favor');
+ $('form#'+fav).replaceWith(new_form);
+ $('form#'+dis).ajaxForm(disoptions).each(addAjaxHidden);
+ }
+ };
+
+ var disoptions = { dataType: 'xml',
+ beforeSubmit: function(data, target, options) {
+ $(target).addClass('processing');
+ return true;
+ },
+ success: function(xml) { var new_form = document._importNode($('form', xml).get(0), true);
+ var fav = new_form.id;
+ var dis = fav.replace('favor', 'disfavor');
+ $('form#'+dis).replaceWith(new_form);
+ $('form#'+fav).ajaxForm(favoptions).each(addAjaxHidden);
+ }
+ };
+
+ $("form.form_favor").ajaxForm(favoptions);
+ $("form.form_disfavor").ajaxForm(disoptions);
+ $("form.form_favor").each(addAjaxHidden);
+ $("form.form_disfavor").each(addAjaxHidden);
+}
+
function NoticeReply() {
if ($('#notice_data-text').length > 0 && $('#content .notice_reply').length > 0) {
$('#content .notice').each(function() {
diff --git a/locale/it_IT/LC_MESSAGES/statusnet.mo b/locale/it_IT/LC_MESSAGES/statusnet.mo
index 95764f1e29..00ab59804a 100644
Binary files a/locale/it_IT/LC_MESSAGES/statusnet.mo and b/locale/it_IT/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/mk_MK/LC_MESSAGES/statusnet.mo b/locale/mk_MK/LC_MESSAGES/statusnet.mo
index 0ac378c79e..5dec309dd9 100644
Binary files a/locale/mk_MK/LC_MESSAGES/statusnet.mo and b/locale/mk_MK/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/mk_MK/LC_MESSAGES/statusnet.po b/locale/mk_MK/LC_MESSAGES/statusnet.po
index d4c4eb2354..4dfadc61e1 100644
--- a/locale/mk_MK/LC_MESSAGES/statusnet.po
+++ b/locale/mk_MK/LC_MESSAGES/statusnet.po
@@ -4667,16 +4667,6 @@ msgstr ""
msgid "%1$s is now listening to "
msgstr "%1$s сега ги следи вашите забелешки за %2$s."
-#: lib/mail.php:254
-#, fuzzy, php-format
-msgid "Location: %s\n"
-msgstr "Локација"
-
-#: lib/mail.php:256
-#, fuzzy, php-format
-msgid "Homepage: %s\n"
-msgstr "Домашна страница"
-
#: lib/mail.php:258
#, php-format
msgid ""
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo
index 9db1638b08..a5a6f27253 100644
Binary files a/locale/pt_BR/LC_MESSAGES/statusnet.mo and b/locale/pt_BR/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/vi_VN/LC_MESSAGES/statusnet.mo b/locale/vi_VN/LC_MESSAGES/statusnet.mo
index 65add28b47..b2f4dd370a 100644
Binary files a/locale/vi_VN/LC_MESSAGES/statusnet.mo and b/locale/vi_VN/LC_MESSAGES/statusnet.mo differ
diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js
index ae4d53d095..9e5593d257 100644
--- a/plugins/InfiniteScroll/infinitescroll.js
+++ b/plugins/InfiniteScroll/infinitescroll.js
@@ -1,8 +1,14 @@
jQuery(document).ready(function($){
$('notices_primary').infinitescroll({
- debug: true,
+ debug: false,
infiniteScroll : false,
- nextSelector : "li.nav_next a",
+ nextSelector : 'body#public li.nav_next a,'+
+ 'body#all li.nav_next a,'+
+ 'body#showstream li.nav_next a,'+
+ 'body#replies li.nav_next a,'+
+ 'body#showfavorites li.nav_next a,'+
+ 'body#showgroup li.nav_next a,'+
+ 'body#favorited li.nav_next a',
loadingImg : $('address .url')[0].href+'plugins/InfiniteScroll/ajax-loader.gif',
text : "Loading the next set of posts...",
donetext : "Congratulations, you\'ve reached the end of the Internet.",
@@ -11,5 +17,7 @@ jQuery(document).ready(function($){
itemSelector : "#notices_primary ol.notices li"
},function(){
NoticeAttachments();
+ NoticeReply();
+ NoticeFavors();
});
});
diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index 9ce68775bf..cdd1d63fab 100644
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -1,6 +1,4 @@
// Update the local timeline from a Meteor server
-// XXX: If @a is subscribed to @b, @a should get @b's notices in @a's Personal timeline.
-// Do Replies timeline.
var MeteorUpdater = function()
{
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 1819279686..0f0d0f9f42 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -230,7 +230,6 @@ class RealtimePlugin extends Plugin
}
$action->showContentBlock();
- $action->showScripts();
$action->elementEnd('body');
return false; // No default processing
}