Merge branch 'master' of github.com:webnotes/wnframework

This commit is contained in:
Rushabh Mehta 2013-08-28 14:06:53 +05:30
commit f8b563dc67
4 changed files with 5 additions and 7 deletions

View file

@ -7,7 +7,7 @@ cur_frm.cscript.onload = function(doc) {
cur_frm.fields_dict.lead.get_query = function() {
return {
query: "core.doctype.communication.communication.get_user"
query: "core.doctype.communication.communication.get_lead"
}
};

View file

@ -674,10 +674,6 @@ wn.ui.form.ControlLink = wn.ui.form.ControlData.extend({
});
},
open: function(event, ui) {
if(cur_dialog) {
var zindex = cint(cur_dialog.$wrapper.css("z-index")) + 1
$(this).autocomplete("widget").css("z-index", zindex);
}
me.autocomplete_open = true;
},
close: function(event, ui) {

View file

@ -26,8 +26,9 @@ wn.ui.Dialog = wn.ui.FieldGroup.extend({
$.extend(this, opts);
this.make();
},
make: function() {
this.$wrapper = $('<div class="modal" style="overflow: auto;">\
make: function() {
// ui-front class is used as appendTo by jquery.autocomplete
this.$wrapper = $('<div class="modal ui-front" style="overflow: auto;">\
<div class="modal-dialog">\
<div class="modal-content">\
<div class="modal-header">\

View file

@ -345,6 +345,7 @@ wn.views.CommunicationComposer = Class.extend({
}
});
},
appendTo: this.dialog.$wrapper,
focus: function() {
// prevent value inserted on focus
return false;