wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'refs/merge-requests/49' of https://gitorious.org/social/mainline into merge-requests/49

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-02-25 12:49:58 +01:00
commit 611e5ab421
2 changed files with 68 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
js/util.js
View File

@ -1562,60 +1562,6 @@ var SN = { // StatusNet
});
},
/**
* Called when a people tag edit box is shown in the interface
*
* - loads the jQuery UI autocomplete plugin
* - sets event handlers for tag completion
*
*/
PeopletagAutocomplete: function (txtBox) {
var split = function (val) {
return val.split( /\s+/ );
}
var extractLast = function (term) {
return split(term).pop();
}
// don't navigate away from the field on tab when selecting an item
txtBox.on( "keydown", function ( event ) {
if ( event.keyCode === $.ui.keyCode.TAB &&
$(this).data( "ui-autocomplete" ).menu.active ) {
event.preventDefault();
}
}).autocomplete({
minLength: 0,
source: function (request, response) {
// delegate back to autocomplete, but extract the last term
response($.ui.autocomplete.filter(
SN.C.PtagACData, extractLast(request.term)));
},
focus: function () {
return false;
},
select: function (event, ui) {
var terms = split(this.value);
terms.pop();
terms.push(ui.item.value);
terms.push("");
this.value = terms.join(" ");
return false;
}
}).data('ui-autocomplete')._renderItem = function (ul, item) {
// FIXME: with jQuery UI you cannot have it highlight the match
var _l = '<a class="ptag-ac-line-tag">' + item.tag
+ ' <em class="privacy_mode">' + item.mode + '</em>'
+ '<span class="freq">' + item.freq + '</span></a>'
return $("<li/>")
.addClass('mode-' + item.mode)
.addClass('ptag-ac-line')
.data("item.autocomplete", item)
.append(_l)
.appendTo(ul);
}
},
/**
* Run setup for the ajax people tags editor
*
@ -1644,7 +1590,6 @@ var SN = { // StatusNet
}
SN.C.PtagACData = data;
SN.Init.PeopletagAutocomplete(form.find('#tags'));
}
});

69
plugins/Autocomplete/js/autocomplete.go.js
View File

@ -13,7 +13,7 @@ SN.Init.NoticeFormSetup = function(form) {
// Only attach to traditional-style forms
var textarea = form.find('.notice_data-text:first');
if (textarea.length == 0) {
if (textarea.length === 0) {
return;
}
@ -69,3 +69,70 @@ SN.Init.NoticeFormSetup = function(form) {
.appendTo(ul);
};
};
/**
* Called when a people tag edit box is shown in the interface
*
* - loads the jQuery UI autocomplete plugin
* - sets event handlers for tag completion
*
*/
SN.Init.PeopletagAutocomplete = function(txtBox) {
var split,
extractLast;
split = function(val) {
return val.split( /\s+/ );
};
extractLast = function(term) {
return split(term).pop();
};
// don't navigate away from the field on tab when selecting an item
txtBox
.on('keydown', function(event) {
if (event.keyCode === $.ui.keyCode.TAB &&
$(this).data('ui-autocomplete').menu.active) {
event.preventDefault();
}
})
.autocomplete({
minLength: 0,
source: function(request, response) {
// delegate back to autocomplete, but extract the last term
response($.ui.autocomplete.filter(
SN.C.PtagACData, extractLast(request.term)));
},
focus: function () {
return false;
},
select: function(event, ui) {
var terms = split(this.value);
terms.pop();
terms.push(ui.item.value);
terms.push('');
this.value = terms.join(' ');
return false;
}
})
.data('ui-autocomplete')
._renderItem = function (ul, item) {
// FIXME: with jQuery UI you cannot have it highlight the match
var _l = '<a class="ptag-ac-line-tag">' + item.tag +
' <em class="privacy_mode">' + item.mode + '</em>' +
'<span class="freq">' + item.freq + '</span></a>';
return $('<li/>')
.addClass('mode-' + item.mode)
.addClass('ptag-ac-line')
.data('item.autocomplete', item)
.append(_l)
.appendTo(ul);
};
};
$(document).on('click', '.peopletags_edit_button', function () {
SN.Init.PeopletagAutocomplete($(this).closest('dd').find('[name="tags"]'));
});