From c9eb7c1f0b60cbcf4672bcfca0814dd1bfc1dcf0 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 11 Nov 2009 10:04:27 -0800 Subject: Bug 1969: rebuild corrupted l10n files which caused all UI strings to be shown as nulls (already done on 0.9.x in course of other major l10n changes) http://status.net/trac/ticket/1969 --- locale/it_IT/LC_MESSAGES/statusnet.mo | Bin 80186 -> 83401 bytes locale/mk_MK/LC_MESSAGES/statusnet.mo | Bin 37731 -> 50541 bytes locale/mk_MK/LC_MESSAGES/statusnet.po | 10 ---------- locale/pt_BR/LC_MESSAGES/statusnet.mo | Bin 76797 -> 83652 bytes locale/vi_VN/LC_MESSAGES/statusnet.mo | Bin 50650 -> 78725 bytes 5 files changed, 10 deletions(-) diff --git a/locale/it_IT/LC_MESSAGES/statusnet.mo b/locale/it_IT/LC_MESSAGES/statusnet.mo index 95764f1e2..00ab59804 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 0ac378c79..5dec309dd 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 d4c4eb235..4dfadc61e 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 9db1638b0..a5a6f2725 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 65add28b4..b2f4dd370 100644 Binary files a/locale/vi_VN/LC_MESSAGES/statusnet.mo and b/locale/vi_VN/LC_MESSAGES/statusnet.mo differ -- cgit v1.2.3-54-g00ecf From 83b92d9ef01cdf640eb7f88e218569e6a5aebbdd Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 11 Nov 2009 15:37:17 -0500 Subject: Refactored the favorite button ajaxification to a separate function --- js/util.js | 83 ++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 38 deletions(-) diff --git a/js/util.js b/js/util.js index 2165957c3..879bb38ae 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() { -- cgit v1.2.3-54-g00ecf From 03022c6e601f223c92216af9748c764786cf46c2 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 11 Nov 2009 15:38:28 -0500 Subject: Resetup the ajaxification for replies and favors after inf. scrolling Made the selector much more specific, so it only works on pages that have notices --- plugins/InfiniteScroll/infinitescroll.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js index ae4d53d09..5084af91f 100644 --- a/plugins/InfiniteScroll/infinitescroll.js +++ b/plugins/InfiniteScroll/infinitescroll.js @@ -2,7 +2,13 @@ jQuery(document).ready(function($){ $('notices_primary').infinitescroll({ debug: true, 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(); }); }); -- cgit v1.2.3-54-g00ecf From 4f1b7fe575bec23ae9b6a595c0524ddd30434310 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 11 Nov 2009 15:39:23 -0500 Subject: Disable debug mode (so there are no messages written to the javascript console) --- plugins/InfiniteScroll/infinitescroll.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js index 5084af91f..9e5593d25 100644 --- a/plugins/InfiniteScroll/infinitescroll.js +++ b/plugins/InfiniteScroll/infinitescroll.js @@ -1,6 +1,6 @@ jQuery(document).ready(function($){ $('notices_primary').infinitescroll({ - debug: true, + debug: false, infiniteScroll : false, nextSelector : 'body#public li.nav_next a,'+ 'body#all li.nav_next a,'+ -- cgit v1.2.3-54-g00ecf From c28b9ce31a0d20d3ee1907f6ab3aa197175b7411 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 12 Nov 2009 10:24:18 +0000 Subject: Removed old comments --- plugins/Meteor/meteorupdater.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js index 9ce68775b..cdd1d63fa 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() { -- cgit v1.2.3-54-g00ecf From 3752c1fdcee53c7e609d77600591b7de78b7ce3b Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 12 Nov 2009 10:37:43 +0000 Subject: Removed extra showScript() call at the bottom of the document. 0.8.x is using for scripts whereas 0.9.x puts it before . This also fixes the duplicate posts --- plugins/Realtime/RealtimePlugin.php | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 181927968..0f0d0f9f4 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 } -- cgit v1.2.3-54-g00ecf