From bb0bf635d881e4238cfce3cbb269b3f70b45b8e3 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 30 Jan 2010 15:03:01 +0100 Subject: Using form object instead of form_id and find(). Slightly faster and easier to read. --- js/util.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/js/util.js b/js/util.js index b864867fd..6bc174049 100644 --- a/js/util.js +++ b/js/util.js @@ -185,13 +185,13 @@ var SN = { // StatusNet dataType: 'xml', timeout: '60000', beforeSend: function(formData) { - if ($('#'+form_id+' #'+SN.C.S.NoticeDataText)[0].value.length === 0) { + if (form.find('#'+SN.C.S.NoticeDataText)[0].value.length === 0) { form.addClass(SN.C.S.Warning); return false; } form.addClass(SN.C.S.Processing); - $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled); - $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).attr(SN.C.S.Disabled, SN.C.S.Disabled); + form.find('#'+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled); + form.find('#'+SN.C.S.NoticeActionSubmit).attr(SN.C.S.Disabled, SN.C.S.Disabled); NLat = $('#'+SN.C.S.NoticeLat).val(); NLon = $('#'+SN.C.S.NoticeLon).val(); @@ -221,9 +221,9 @@ var SN = { // StatusNet }, error: function (xhr, textStatus, errorThrown) { form.removeClass(SN.C.S.Processing); - $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); - $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled, SN.C.S.Disabled); - $('#'+form_id+' .form_response').remove(); + form.find('#'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); + form.find('#'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled, SN.C.S.Disabled); + form.find('.form_response').remove(); if (textStatus == 'timeout') { form.append('

Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.

'); } @@ -233,9 +233,9 @@ var SN = { // StatusNet } else { if (parseInt(xhr.status) === 0 || jQuery.inArray(parseInt(xhr.status), SN.C.I.HTTP20x30x) >= 0) { - $('#'+form_id).resetForm(); - $('#'+form_id+' #'+SN.C.S.NoticeDataAttachSelected).remove(); - SN.U.FormNoticeEnhancements($('#'+form_id)); + form.resetForm(); + form.find('#'+SN.C.S.NoticeDataAttachSelected).remove(); + SN.U.FormNoticeEnhancements(form); } else { form.append('

(Sorry! We had trouble sending your notice ('+xhr.status+' '+xhr.statusText+'). Please report the problem to the site administrator if this happens again.

'); @@ -244,7 +244,7 @@ var SN = { // StatusNet } }, success: function(data, textStatus) { - $('#'+form_id+' .form_response').remove(); + form.find('.form_response').remove(); var result; if ($('#'+SN.C.S.Error, data).length > 0) { result = document._importNode($('p', data)[0], true); @@ -290,16 +290,16 @@ var SN = { // StatusNet form.append('

'+result_title+'

'); } } - $('#'+form_id).resetForm(); - $('#'+form_id+' #'+SN.C.S.NoticeInReplyTo).val(''); - $('#'+form_id+' #'+SN.C.S.NoticeDataAttachSelected).remove(); - SN.U.FormNoticeEnhancements($('#'+form_id)); + form.resetForm(); + form.find('#'+SN.C.S.NoticeInReplyTo).val(''); + form.find('#'+SN.C.S.NoticeDataAttachSelected).remove(); + SN.U.FormNoticeEnhancements(form); } }, complete: function(xhr, textStatus) { form.removeClass(SN.C.S.Processing); - $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled); - $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); + form.find('#'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled); + form.find('#'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); $('#'+SN.C.S.NoticeLat).val(NLat); $('#'+SN.C.S.NoticeLon).val(NLon); -- cgit v1.2.3-54-g00ecf From aa3170cf34e2b2120547691e204d5ac3bdfd07aa Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 30 Jan 2010 15:19:13 +0100 Subject: Using jQuery chaining in FormNoticeXHR --- js/util.js | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/js/util.js b/js/util.js index 6bc174049..4818be47e 100644 --- a/js/util.js +++ b/js/util.js @@ -189,9 +189,11 @@ var SN = { // StatusNet form.addClass(SN.C.S.Warning); return false; } - form.addClass(SN.C.S.Processing); - form.find('#'+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled); - form.find('#'+SN.C.S.NoticeActionSubmit).attr(SN.C.S.Disabled, SN.C.S.Disabled); + form + .addClass(SN.C.S.Processing) + .find('#'+SN.C.S.NoticeActionSubmit) + .addClass(SN.C.S.Disabled) + .attr(SN.C.S.Disabled, SN.C.S.Disabled); NLat = $('#'+SN.C.S.NoticeLat).val(); NLon = $('#'+SN.C.S.NoticeLon).val(); @@ -220,9 +222,11 @@ var SN = { // StatusNet return true; }, error: function (xhr, textStatus, errorThrown) { - form.removeClass(SN.C.S.Processing); - form.find('#'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); - form.find('#'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled, SN.C.S.Disabled); + form + .removeClass(SN.C.S.Processing) + .find('#'+SN.C.S.NoticeActionSubmit) + .removeClass(SN.C.S.Disabled) + .removeAttr(SN.C.S.Disabled, SN.C.S.Disabled); form.find('.form_response').remove(); if (textStatus == 'timeout') { form.append('

Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.

'); @@ -233,8 +237,9 @@ var SN = { // StatusNet } else { if (parseInt(xhr.status) === 0 || jQuery.inArray(parseInt(xhr.status), SN.C.I.HTTP20x30x) >= 0) { - form.resetForm(); - form.find('#'+SN.C.S.NoticeDataAttachSelected).remove(); + form + .resetForm() + .find('#'+SN.C.S.NoticeDataAttachSelected).remove(); SN.U.FormNoticeEnhancements(form); } else { @@ -277,8 +282,9 @@ var SN = { // StatusNet else { notices.prepend(notice); } - $('#'+notice.id).css({display:'none'}); - $('#'+notice.id).fadeIn(2500); + $('#'+notice.id) + .css({display:'none'}) + .fadeIn(2500); SN.U.NoticeWithAttachment($('#'+notice.id)); SN.U.NoticeReplyTo($('#'+notice.id)); SN.U.FormXHR($('#'+notice.id+' .form_favor')); @@ -297,9 +303,11 @@ var SN = { // StatusNet } }, complete: function(xhr, textStatus) { - form.removeClass(SN.C.S.Processing); - form.find('#'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled); - form.find('#'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); + form + .removeClass(SN.C.S.Processing) + .find('#'+SN.C.S.NoticeActionSubmit) + .removeAttr(SN.C.S.Disabled) + .removeClass(SN.C.S.Disabled); $('#'+SN.C.S.NoticeLat).val(NLat); $('#'+SN.C.S.NoticeLon).val(NLon); -- cgit v1.2.3-54-g00ecf From 4d0ee6a41f3cfb2e99dcb92e7b14f3183393f1a5 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 30 Jan 2010 15:28:31 +0100 Subject: Globalized form notice data geo values --- js/util.js | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/js/util.js b/js/util.js index 4818be47e..bbc6fdb28 100644 --- a/js/util.js +++ b/js/util.js @@ -178,7 +178,7 @@ var SN = { // StatusNet }, FormNoticeXHR: function(form) { - var NDG, NLat, NLon, NLNS, NLID; + SN.C.I.NoticeDataGeo = {}; form_id = form.attr('id'); form.append(''); form.ajaxForm({ @@ -195,28 +195,28 @@ var SN = { // StatusNet .addClass(SN.C.S.Disabled) .attr(SN.C.S.Disabled, SN.C.S.Disabled); - NLat = $('#'+SN.C.S.NoticeLat).val(); - NLon = $('#'+SN.C.S.NoticeLon).val(); - NLNS = $('#'+SN.C.S.NoticeLocationNs).val(); - NLID = $('#'+SN.C.S.NoticeLocationId).val(); - NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked'); + SN.C.I.NoticeDataGeo.NLat = $('#'+SN.C.S.NoticeLat).val(); + SN.C.I.NoticeDataGeo.NLon = $('#'+SN.C.S.NoticeLon).val(); + SN.C.I.NoticeDataGeo.NLNS = $('#'+SN.C.S.NoticeLocationNs).val(); + SN.C.I.NoticeDataGeo.NLID = $('#'+SN.C.S.NoticeLocationId).val(); + SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked'); cookieValue = $.cookie(SN.C.S.NoticeDataGeoCookie); if (cookieValue !== null && cookieValue != 'disabled') { cookieValue = JSON.parse(cookieValue); - NLat = $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat).val(); - NLon = $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon).val(); + SN.C.I.NoticeDataGeo.NLat = $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat).val(); + SN.C.I.NoticeDataGeo.NLon = $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon).val(); if ($('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)) { - NLNS = $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val(); - NLID = $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val(); + SN.C.I.NoticeDataGeo.NLNS = $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val(); + SN.C.I.NoticeDataGeo.NLID = $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val(); } } if (cookieValue == 'disabled') { - NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', false).attr('checked'); + SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', false).attr('checked'); } else { - NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', true).attr('checked'); + SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', true).attr('checked'); } return true; @@ -309,13 +309,13 @@ var SN = { // StatusNet .removeAttr(SN.C.S.Disabled) .removeClass(SN.C.S.Disabled); - $('#'+SN.C.S.NoticeLat).val(NLat); - $('#'+SN.C.S.NoticeLon).val(NLon); + $('#'+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat); + $('#'+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon); if ($('#'+SN.C.S.NoticeLocationNs)) { - $('#'+SN.C.S.NoticeLocationNs).val(NLNS); - $('#'+SN.C.S.NoticeLocationId).val(NLID); + $('#'+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS); + $('#'+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID); } - $('#'+SN.C.S.NoticeDataGeo).attr('checked', NDG); + $('#'+SN.C.S.NoticeDataGeo).attr('checked', SN.C.I.NoticeDataGeo.NDG); } }); }, -- cgit v1.2.3-54-g00ecf