Using object value instead of inline string

[quix0rs-gnu-social.git] / js / util.js

diff --git a/js/util.js b/js/util.js
index 8716a336095b98eb9d64d1479a119f834fe707f8..048d3f1eb146752a443916570baaffe52e438ab4 100644 (file)
--- a/js/util.js
+++ b/js/util.js
@@ -52,7 +52,9 @@ var SN = { // StatusNet
             NoticeLocationId: 'notice_data-location_id',
             NoticeLocationNs: 'notice_data-location_ns',
             NoticeLocationName: 'notice_data-location_name',
-            NoticeLocationCookieName: 'location_enabled'
+            NoticeLocationCookieName: 'location_enabled',
+            NoticeDataGeo: 'notice_data-geo',
+            NoticeDataGeoSelected: 'notice_data-geo_selected'
         }
     },
 
@@ -433,19 +435,63 @@ var SN = { // StatusNet
                 $('#'+SN.C.S.NoticeDataAttachSelected+' button').click(function(){
                     $('#'+SN.C.S.NoticeDataAttachSelected).remove();
                     NDA.val('');
+
+                    return false;
                 });
             });
         },
 
         NoticeLocationAttach: function() {
-            if ($('#notice_data-location_enabled').length > 0) {
+            var NDG = $('#'+SN.C.S.NoticeDataGeo);
+            if (NDG.length > 0) {
+                var NLE = $('#notice_data-location_wrap');
+                var geocodeURL = NLE.attr('title');
+
+                $('label[for='+SN.C.S.NoticeDataGeo+']').attr('title', NLE.text());
+
                 if (navigator.geolocation) {
-                    $('#notice_data-location_enabled').change(function() {
-                        $.cookie(SN.C.S.NoticeLocationCookieName, $('#notice_data-location_enabled').attr('checked'));
+                    NDG.change(function() {
+                        NLE.removeAttr('title');
+
+                        $.cookie(SN.C.S.NoticeLocationCookieName, $('#'+SN.C.S.NoticeDataGeo).attr('checked'));
+
+                        var NLN = $('#'+SN.C.S.NoticeLocationName);
+                        if (NLN.length > 0) {
+                            NLN.remove();
+                        }
+
+                        var S = '<div id="'+SN.C.S.NoticeDataGeoSelected+'" class="'+SN.C.S.Success+'"/>';
+                        NDGS = $('#'+SN.C.S.NoticeDataGeoSelected);
+                        if (NDGS.length > 0) {
+                            NDGS.replaceWith(S);
+                        }
+                        else {
+                            $('#'+SN.C.S.FormNotice).append(S);
+                        }
+                        NDGS = $('#'+SN.C.S.NoticeDataGeoSelected);
+                        NDGS.prepend('<span id="'+SN.C.S.NoticeLocationName+'">Geo</span>');
 
-                        if ($('#notice_data-location_enabled').attr('checked') === true) {
-                            $('#'+SN.C.S.NoticeLocationName).show();
-                            $('#'+SN.C.S.NoticeLocationName).addClass('processing');
+                        NLN = $('#'+SN.C.S.NoticeLocationName);
+
+                        if ($('#'+SN.C.S.NoticeDataGeo).attr('checked') === true) {
+                            NLN.addClass('processing');
+                            $('label[for='+SN.C.S.NoticeDataGeo+']').addClass('checked');
+
+                            NDGS.append('<button class="minimize">&#95;</button> <button class="close">&#215;</button>');
+
+                            $('#'+SN.C.S.NoticeDataGeoSelected+' button.close').click(function(){
+                                $('#'+SN.C.S.NoticeDataGeoSelected).remove();
+                                $('#'+SN.C.S.NoticeDataGeo).attr('checked', false);
+                                $('label[for='+SN.C.S.NoticeDataGeo+']').removeClass('checked');
+
+                                return false;
+                            });
+
+                            $('#'+SN.C.S.NoticeDataGeoSelected+' button.minimize').click(function(){
+                                $('#'+SN.C.S.NoticeDataGeoSelected).hide();
+
+                                return false;
+                            });
 
                             navigator.geolocation.getCurrentPosition(function(position) {
                                 $('#'+SN.C.S.NoticeLat).val(position.coords.latitude);
@@ -457,8 +503,9 @@ var SN = { // StatusNet
                                     'token': $('#token').val()
                                 };
 
-                                $.getJSON($('#notice_data-location_enabled_container').attr('data-geocode-url'), data,function(location) {
-                                    $('#'+SN.C.S.NoticeLocationName).removeClass('processing');
+                                $.getJSON(geocodeURL, data, function(location) {
+                                    NLN.replaceWith('<a id="notice_data-location_name"/>');
+                                    NLN = $('#'+SN.C.S.NoticeLocationName);
 
                                     if (typeof(location.location_ns) != 'undefined') {
                                         $('#'+SN.C.S.NoticeLocationNs).val(location.location_ns);
@@ -469,17 +516,25 @@ var SN = { // StatusNet
                                     }
 
                                     if (typeof(location.name) == 'undefined') {
-                                        $('#'+SN.C.S.NoticeLocationName).text(position.coords.latitude + ' ' + position.coords.longitude);
+                                        NLN_text = position.coords.latitude + ';' + position.coords.longitude;
                                     }
                                     else {
-                                        $('#'+SN.C.S.NoticeLocationName).text(location.name);
-                                        $('#'+SN.C.S.NoticeLocationName).attr('href',location.url);
+                                        NLN_text = location.name;
                                     }
+
+                                    NLN.attr('href', location.url);
+                                    NLN.text(NLN_text);
+                                    NLN.click(function() {
+                                        window.open(location.url);
+
+                                        return false;
+                                    });
                                 });
                             });
                         }
                         else {
-                            $('#'+SN.C.S.NoticeLocationName).hide();
+                            $('label[for='+SN.C.S.NoticeDataGeo+']').removeClass('checked');
+                            NDGS.hide();
                             $('#'+SN.C.S.NoticeLat).val('');
                             $('#'+SN.C.S.NoticeLon).val('');
                             $('#'+SN.C.S.NoticeLocationNs).val('');
@@ -488,8 +543,8 @@ var SN = { // StatusNet
                     });
 
                     var cookieVal = $.cookie(SN.C.S.NoticeLocationCookieName);
-                    $('#notice_data-location_enabled').attr('checked',(cookieVal == null || cookieVal == 'true'));
-                    $('#notice_data-location_enabled').change();
+                    NDG.attr('checked', (cookieVal == null || cookieVal == 'true'));
+                    NDG.change();
                 }
             }
         },