Merge branch 'develop'
This commit is contained in:
commit
ffa1cc25c4
8 changed files with 9 additions and 16 deletions
|
|
@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
|
|||
from .exceptions import *
|
||||
from .utils.jinja import get_jenv, get_template, render_template
|
||||
|
||||
__version__ = '8.0.9'
|
||||
__version__ = '8.0.10'
|
||||
__title__ = "Frappe Framework"
|
||||
|
||||
local = Local()
|
||||
|
|
|
|||
|
|
@ -246,6 +246,7 @@
|
|||
}
|
||||
.taggle_list li .awesomplete > ul {
|
||||
top: 15px;
|
||||
z-index: 100;
|
||||
}
|
||||
.taggle_list .close {
|
||||
right: 5px;
|
||||
|
|
|
|||
|
|
@ -106,9 +106,6 @@
|
|||
.page-form .checkbox {
|
||||
margin-top: 2px;
|
||||
}
|
||||
.page-form .checkbox input {
|
||||
margin-top: -3px;
|
||||
}
|
||||
select.input-sm {
|
||||
line-height: 1.2em !important;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ frappe.dom = {
|
|||
elements[i].parentNode.removeChild(elements[i]);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// remove links with rel="stylesheet"
|
||||
var elements = div.getElementsByTagName('link');
|
||||
var i = elements.length;
|
||||
|
|
@ -141,10 +141,7 @@ frappe.dom = {
|
|||
if(!frappe.dom.freeze_count) return; // anything open?
|
||||
frappe.dom.freeze_count--;
|
||||
if(!frappe.dom.freeze_count) {
|
||||
var freeze = $('#freeze').removeClass("in");
|
||||
setTimeout(function() {
|
||||
if(!frappe.dom.freeze_count) { freeze.remove(); }
|
||||
}, 150);
|
||||
var freeze = $('#freeze').removeClass("in").remove();
|
||||
}
|
||||
},
|
||||
save_selection: function() {
|
||||
|
|
|
|||
|
|
@ -621,7 +621,7 @@ frappe.ui.form.ControlDate = frappe.ui.form.ControlData.extend({
|
|||
if(value
|
||||
&& ((this.last_value && this.last_value !== this.value)
|
||||
|| (!this.datepicker.selectedDates.length))) {
|
||||
this.datepicker.selectDate(new Date(value));
|
||||
this.datepicker.selectDate(frappe.datetime.str_to_obj(value));
|
||||
}
|
||||
},
|
||||
set_date_options: function() {
|
||||
|
|
@ -1418,7 +1418,8 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
|
|||
});
|
||||
|
||||
this.$input.on("awesomplete-open", function(e) {
|
||||
me.$wrapper.css({"z-index": 101});
|
||||
me.$wrapper.css({"z-index": 100});
|
||||
me.$wrapper.find('ul').css({"z-index": 100});
|
||||
me.autocomplete_open = true;
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@ frappe.search.utils = {
|
|||
value: __("Open {0}", [__(target)]),
|
||||
index: me.fuzzy_search(keywords, 'Calendar'),
|
||||
match: target,
|
||||
route: [target, 'Event'],
|
||||
route: ['List', 'Event', target],
|
||||
});
|
||||
}
|
||||
return out;
|
||||
|
|
|
|||
|
|
@ -308,6 +308,7 @@
|
|||
|
||||
.awesomplete > ul {
|
||||
top: 15px;
|
||||
z-index: 100;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -130,10 +130,6 @@
|
|||
margin-top: 2px;
|
||||
}
|
||||
|
||||
.page-form .checkbox input {
|
||||
margin-top: -3px;
|
||||
}
|
||||
|
||||
select.input-sm {
|
||||
line-height: 1.2em !important;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue