Merge pull request #2142 from fabrixxm/issue_1920
Fix contact popup with tinyMCE
This commit is contained in:
commit
4e725c3699
1 changed files with 30 additions and 29 deletions
|
@ -3,9 +3,9 @@
|
||||||
*
|
*
|
||||||
* require jQuery, jquery.textareas
|
* require jQuery, jquery.textareas
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function ACPopup(elm,backend_url){
|
function ACPopup(elm,backend_url){
|
||||||
this.idsel=-1;
|
this.idsel=-1;
|
||||||
this.element = elm;
|
this.element = elm;
|
||||||
|
@ -23,18 +23,19 @@ function ACPopup(elm,backend_url){
|
||||||
var h = 130;
|
var h = 130;
|
||||||
|
|
||||||
|
|
||||||
if(typeof elm.editorId == "undefined") {
|
if(tinyMCE.activeEditor == null) {
|
||||||
style = $(elm).offset();
|
style = $(elm).offset();
|
||||||
w = $(elm).width();
|
w = $(elm).width();
|
||||||
h = $(elm).height();
|
h = $(elm).height();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
var container = elm.getContainer();
|
// I can't find an "official" way to get the element who get all
|
||||||
if(typeof container != "undefined") {
|
// this fraking thing that is tinyMCE.
|
||||||
style = $(container).offset();
|
// This code will broke again at some point...
|
||||||
w = $(container).width();
|
var container = $(tinyMCE.activeEditor.getContainer()).find("table");
|
||||||
h = $(container).height();
|
style = $(container).offset();
|
||||||
}
|
w = $(container).width();
|
||||||
|
h = $(container).height();
|
||||||
}
|
}
|
||||||
|
|
||||||
style.top=style.top+h;
|
style.top=style.top+h;
|
||||||
|
@ -43,15 +44,15 @@ function ACPopup(elm,backend_url){
|
||||||
/* style['max-height'] = '150px';
|
/* style['max-height'] = '150px';
|
||||||
style.border = '1px solid red';
|
style.border = '1px solid red';
|
||||||
style.background = '#cccccc';
|
style.background = '#cccccc';
|
||||||
|
|
||||||
style.overflow = 'auto';
|
style.overflow = 'auto';
|
||||||
style['z-index'] = '100000';
|
style['z-index'] = '100000';
|
||||||
*/
|
*/
|
||||||
style.display = 'none';
|
style.display = 'none';
|
||||||
|
|
||||||
this.cont = $("<div class='acpopup'></div>");
|
this.cont = $("<div class='acpopup'></div>");
|
||||||
this.cont.css(style);
|
this.cont.css(style);
|
||||||
|
|
||||||
$("body").append(this.cont);
|
$("body").append(this.cont);
|
||||||
}
|
}
|
||||||
ACPopup.prototype.close = function(){
|
ACPopup.prototype.close = function(){
|
||||||
|
@ -64,7 +65,7 @@ ACPopup.prototype.search = function(text){
|
||||||
if (this.kp_timer) clearTimeout(this.kp_timer);
|
if (this.kp_timer) clearTimeout(this.kp_timer);
|
||||||
this.kp_timer = setTimeout( function(){that._search();}, 500);
|
this.kp_timer = setTimeout( function(){that._search();}, 500);
|
||||||
}
|
}
|
||||||
ACPopup.prototype._search = function(){
|
ACPopup.prototype._search = function(){
|
||||||
console.log("_search");
|
console.log("_search");
|
||||||
var that = this;
|
var that = this;
|
||||||
var postdata = {
|
var postdata = {
|
||||||
|
@ -74,7 +75,7 @@ ACPopup.prototype._search = function(){
|
||||||
type:'c',
|
type:'c',
|
||||||
conversation: this.conversation_id,
|
conversation: this.conversation_id,
|
||||||
}
|
}
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type:'POST',
|
type:'POST',
|
||||||
url: this.url,
|
url: this.url,
|
||||||
|
@ -87,15 +88,15 @@ ACPopup.prototype._search = function(){
|
||||||
$(data.items).each(function(){
|
$(data.items).each(function(){
|
||||||
var html = "<img src='{0}' height='16px' width='16px'>{1} ({2})".format(this.photo, this.name, this.nick);
|
var html = "<img src='{0}' height='16px' width='16px'>{1} ({2})".format(this.photo, this.name, this.nick);
|
||||||
var nick = this.nick.replace(' ','');
|
var nick = this.nick.replace(' ','');
|
||||||
if (this.id!=='') nick += '+' + this.id;
|
if (this.id!=='') nick += '+' + this.id;
|
||||||
that.add(html, nick + ' - ' + this.link);
|
that.add(html, nick + ' - ' + this.link);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
that.cont.hide();
|
that.cont.hide();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
ACPopup.prototype.add = function(label, value){
|
ACPopup.prototype.add = function(label, value){
|
||||||
var that=this;
|
var that=this;
|
||||||
|
@ -141,12 +142,12 @@ ACPopup.prototype.onkey = function(event){
|
||||||
if (this.idsel>cmax) this.idsel=0;
|
if (this.idsel>cmax) this.idsel=0;
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (event.keyCode == '38' || event.keyCode == '40' || event.keyCode == '9') {
|
if (event.keyCode == '38' || event.keyCode == '40' || event.keyCode == '9') {
|
||||||
this.cont.children().removeClass('selected');
|
this.cont.children().removeClass('selected');
|
||||||
$(this.cont.children()[this.idsel]).addClass('selected');
|
$(this.cont.children()[this.idsel]).addClass('selected');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (event.keyCode == '27') { //ESC
|
if (event.keyCode == '27') { //ESC
|
||||||
this.close();
|
this.close();
|
||||||
}
|
}
|
||||||
|
@ -156,14 +157,14 @@ function ContactAutocomplete(element,backend_url){
|
||||||
this.pattern=/@([^ \n]+)$/;
|
this.pattern=/@([^ \n]+)$/;
|
||||||
this.popup=null;
|
this.popup=null;
|
||||||
var that = this;
|
var that = this;
|
||||||
|
|
||||||
$(element).unbind('keydown');
|
$(element).unbind('keydown');
|
||||||
$(element).unbind('keyup');
|
$(element).unbind('keyup');
|
||||||
|
|
||||||
$(element).keydown(function(event){
|
$(element).keydown(function(event){
|
||||||
if (that.popup!==null) that.popup.onkey(event);
|
if (that.popup!==null) that.popup.onkey(event);
|
||||||
});
|
});
|
||||||
|
|
||||||
$(element).keyup(function(event){
|
$(element).keyup(function(event){
|
||||||
cpos = $(this).getSelection();
|
cpos = $(this).getSelection();
|
||||||
if (cpos.start==cpos.end){
|
if (cpos.start==cpos.end){
|
||||||
|
@ -174,15 +175,15 @@ function ContactAutocomplete(element,backend_url){
|
||||||
}
|
}
|
||||||
if (that.popup.ready && match[1]!==that.popup.searchText) that.popup.search(match[1]);
|
if (that.popup.ready && match[1]!==that.popup.searchText) that.popup.search(match[1]);
|
||||||
if (!that.popup.ready) that.popup=null;
|
if (!that.popup.ready) that.popup=null;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if (that.popup!==null) {that.popup.close(); that.popup=null;}
|
if (that.popup!==null) {that.popup.close(); that.popup=null;}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -199,4 +200,4 @@ function ContactAutocomplete(element,backend_url){
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue