clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'atcomplete'

This commit is contained in:
Friendika 2011-11-04 01:52:33 -07:00
parent 0130052b2c 51b0f583b0
commit 2765b0ba41
2 changed files with 57 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/fk.autocomplete.js
View File

@ -14,9 +14,17 @@ function ACPopup(elm,backend_url){
this.kp_timer = false; this.kp_timer = false;
this.url = backend_url; this.url = backend_url;
if(typeof elm.editorId == "undefined") {
style = $(elm).offset(); style = $(elm).offset();
w = $(elm).width(); w = $(elm).width();
h = $(elm).height(); h = $(elm).height();
}
else {
style = $(elm.container).offset();
w = elm.container.offsetWidth;
h = elm.container.offsetHeight;
}
style.top=style.top+h; style.top=style.top+h;
style.width = w; style.width = w;
style.position = 'absolute'; style.position = 'absolute';
@ -79,11 +87,20 @@ ACPopup.prototype.add = function(label, value){
var elm = $("<div class='acpopupitem' title='"+value+"'>"+label+"</div>"); var elm = $("<div class='acpopupitem' title='"+value+"'>"+label+"</div>");
elm.click(function(e){ elm.click(function(e){
t = $(this).attr('title').replace(new RegExp(' \- .*'),''); t = $(this).attr('title').replace(new RegExp(' \- .*'),'');
if(typeof(that.element.container) === "undefined") {
el=$(that.element); el=$(that.element);
sel = el.getSelection(); sel = el.getSelection();
sel.start = sel.start- that.searchText.length; sel.start = sel.start- that.searchText.length;
el.setSelection(sel.start,sel.end).replaceSelectedText(t).collapseSelection(false); el.setSelection(sel.start,sel.end).replaceSelectedText(t+' ').collapseSelection(false);
that.close(); that.close();
}
else {
txt = tinyMCE.activeEditor.getContent();
newtxt = txt.replace(that.searchText,t+' ');
tinyMCE.activeEditor.setContent(newtxt);
tinyMCE.activeEditor.focus();
that.close();
}
}); });
$(this.cont).append(elm); $(this.cont).append(elm);
} }

25
view/jot-header.tpl
View File

@ -30,9 +30,26 @@ function initEditor(cb){
content_css: "$baseurl/view/custom_tinymce.css", content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false, theme_advanced_path : false,
setup : function(ed) { setup : function(ed) {
//Character count cPopup = null;
ed.onKeyDown.add(function(ed,e) {
if(cPopup !== null)
cPopup.onkey(e);
});
ed.onKeyUp.add(function(ed, e) { ed.onKeyUp.add(function(ed, e) {
var txt = tinyMCE.activeEditor.getContent(); var txt = tinyMCE.activeEditor.getContent();
match = txt.match(/@([^ \n]+)$/);
if(match!==null) {
if(cPopup === null) {
cPopup = new ACPopup(this,baseurl+"/acl");
}
if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
if(! cPopup.ready) cPopup = null;
}
else {
if(cPopup !== null) { cPopup.close(); cPopup = null; }
}
textlen = txt.length; textlen = txt.length;
if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) { if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
$('#profile-jot-desc').html(ispublic); $('#profile-jot-desc').html(ispublic);
@ -41,6 +58,8 @@ function initEditor(cb){
$('#profile-jot-desc').html('&nbsp;'); $('#profile-jot-desc').html('&nbsp;');
} }
//Character count
if(textlen <= 140) { if(textlen <= 140) {
$('#character-counter').removeClass('red'); $('#character-counter').removeClass('red');
$('#character-counter').removeClass('orange'); $('#character-counter').removeClass('orange');
@ -71,8 +90,8 @@ function initEditor(cb){
editor = true; editor = true;
// setup acl popup // setup acl popup
$("a#jot-perms-icon").fancybox({ $("a#jot-perms-icon").fancybox({
'transitionIn' : 'none', 'transitionIn' : 'elastic',
'transitionOut' : 'none' 'transitionOut' : 'elastic'
}); });
} else { } else {
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();