X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js%2Futil.js;h=b645e8b0298aa1dc0d5e218acac82f979f02aa6e;hb=63ab20d20bfe2985402f7f66c3679bcb36e497e8;hp=3e4da433afd3198f808d2dee5ec8382359ded90c;hpb=95d415257a43d5d4338ce22089463c1820b6bf8b;p=quix0rs-gnu-social.git diff --git a/js/util.js b/js/util.js index 3e4da433af..b645e8b029 100644 --- a/js/util.js +++ b/js/util.js @@ -53,11 +53,11 @@ var SN = { // StatusNet NoticeDataGeo: 'notice_data-geo', NoticeDataGeoCookie: 'NoticeDataGeo', NoticeDataGeoSelected: 'notice_data-geo_selected', - StatusNetInstance: 'StatusNetInstance' } }, V: { // Variables + // These get set on runtime via inline scripting, so don't put anything here. }, /** @@ -359,7 +359,7 @@ var SN = { // StatusNet form.ajaxForm({ dataType: 'xml', - timeout: '60000', + timeout: SN.V.xhrTimeout, beforeSend: function (formData) { if (form.find('.notice_data-text:first').val() == '') { form.addClass(SN.C.S.Warning); @@ -848,27 +848,29 @@ var SN = { // StatusNet NDA.change(function (event) { form.find('.attach-status').remove(); - var filename = $(this).val(); - if (!filename) { - // No file -- we've been tricked! - return false; - } - - var attachStatus = $('
' + file.name + '
'));
var img = $('')
.attr('title', tooltip)
.attr('alt', tooltip)
.attr('src', url)
.attr('style', 'height: 120px');
- form.find('.attach-status').append(img);
+ fileentry.append(img);
+ form.find('.attach-status').append(fileentry);
});
} else {
var img = $('').text(tooltip);
@@ -1251,56 +1256,6 @@ var SN = { // StatusNet
return date;
},
- /**
- * Some sort of object interface for storing some structured
- * information in a cookie.
- *
- * Appears to be used to save the last-used login nickname?
- * That's something that browsers usually take care of for us
- * these days, do we really need to do it? Does anything else
- * use this interface?
- *
- * @fixme what is this?
- * @fixme should this use non-cookie local storage when available?
- */
- StatusNetInstance: {
- /**
- * @fixme what is this?
- */
- Set: function (value) {
- var SNI = SN.U.StatusNetInstance.Get();
- if (SNI !== null) {
- value = $.extend(SNI, value);
- }
-
- $.cookie(
- SN.C.S.StatusNetInstance,
- JSON.stringify(value),
- {
- path: '/',
- expires: SN.U.GetFullYear(2029, 0, 1)
- });
- },
-
- /**
- * @fixme what is this?
- */
- Get: function () {
- var cookieValue = $.cookie(SN.C.S.StatusNetInstance);
- if (cookieValue !== undefined) {
- return JSON.parse(cookieValue);
- }
- return null;
- },
-
- /**
- * @fixme what is this?
- */
- Delete: function () {
- $.removeCookie(SN.C.S.StatusNetInstance);
- }
- },
-
/**
* Check if the current page is a timeline where the current user's
* posts should be displayed immediately on success.
@@ -1594,28 +1549,6 @@ var SN = { // StatusNet
}
},
- /**
- * Run setup code for login form:
- *
- * - loads saved last-used-nickname from cookie
- * - sets event handler to save nickname to cookie on submit
- *
- * @fixme is this necessary? Browsers do their own form saving these days.
- */
- Login: function () {
- if (SN.U.StatusNetInstance.Get() !== null) {
- var nickname = SN.U.StatusNetInstance.Get().Nickname;
- if (nickname !== null) {
- $('#form_login #nickname').val(nickname);
- }
- }
-
- $('#form_login').on('submit', function () {
- SN.U.StatusNetInstance.Set({Nickname: $('#form_login #nickname').val()});
- return true;
- });
- },
-
/**
* Run setup for the ajax people tags editor
*
@@ -1744,9 +1677,6 @@ $(function () {
if ($('#content .entity_actions').length > 0) {
SN.Init.EntityActions();
}
- if ($('#form_login').length > 0) {
- SN.Init.Login();
- }
if ($('#profile_search_results').length > 0) {
SN.Init.ProfileSearch();
}