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 f52c70ba42839fd42fdb01fce9def5f3aa331e99..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,47 +435,116 @@ 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').size()) {
-                if(navigator.geolocation) {
-                    $('#notice_data-location_enabled').change(function() {
-                        $.cookie(SN.C.S.NoticeLocationCookieName, $('#notice_data-location_enabled').attr('checked'));
-                        if($('#notice_data-location_enabled').attr('checked')) {
-                            $('#'+SN.C.S.NoticeLocationName).show();
-                            $('#'+SN.C.S.NoticeLocationName).addClass('processing');
+            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) {
+                    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>');
+
+                        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);
                                 $('#'+SN.C.S.NoticeLon).val(position.coords.longitude);
-                                var data = {'lat': position.coords.latitude,'lon': position.coords.longitude, 'token': $('#token').val()};
-                                $.getJSON($('#notice_data-location_enabled_container').attr('data-geocode-url'), data,function(location) {
-                                    $('#'+SN.C.S.NoticeLocationName).removeClass('processing');
-                                    if(typeof(location.location_ns)!="undefined") $('#'+SN.C.S.NoticeLocationNs).val(location.location_ns);
-                                    if(typeof(location.location_id)!="undefined") $('#'+SN.C.S.NoticeLocationId).val(location.location_id);
-                                    if(typeof(location.name)=="undefined") {
-                                        $('#'+SN.C.S.NoticeLocationName).text(position.coords.latitude + ' ' + position.coords.longitude);
-                                    } else {
-                                        $('#'+SN.C.S.NoticeLocationName).text(location.name);
-                                        $('#'+SN.C.S.NoticeLocationName).attr('href',location.url);
+
+                                var data = {
+                                    'lat': position.coords.latitude,
+                                    'lon': position.coords.longitude,
+                                    'token': $('#token').val()
+                                };
+
+                                $.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);
+                                    }
+
+                                    if (typeof(location.location_id) != 'undefined') {
+                                        $('#'+SN.C.S.NoticeLocationId).val(location.location_id);
                                     }
+
+                                    if (typeof(location.name) == 'undefined') {
+                                        NLN_text = position.coords.latitude + ';' + position.coords.longitude;
+                                    }
+                                    else {
+                                        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();
-                            $('#'+SN.C.S.NoticeLat).val("");
-                            $('#'+SN.C.S.NoticeLon).val("");
-                            $('#'+SN.C.S.NoticeLocationNs).val("");
-                            $('#'+SN.C.S.NoticeLocationId).val("");
+                        }
+                        else {
+                            $('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('');
+                            $('#'+SN.C.S.NoticeLocationId).val('');
                         }
                     });
+
                     var cookieVal = $.cookie(SN.C.S.NoticeLocationCookieName);
-                    $('#notice_data-location_enabled').attr('checked',(cookieVal == null || cookieVal == 'true'));
-                    $('#notice_data-location_enabled').change();
-                } else {
-                    $('#notice_data-location_enabled_container').remove();
+                    NDG.attr('checked', (cookieVal == null || cookieVal == 'true'));
+                    NDG.change();
                 }
             }
         },