diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js index 7e55301d20..f70f58fe75 100644 --- a/frappe/core/page/desktop/desktop.js +++ b/frappe/core/page/desktop/desktop.js @@ -148,12 +148,12 @@ $.extend(frappe.desktop, { return doctype; })); - const clearWiggle = ($close) => { + const clearWiggle = () => { const $closes = $cases.find('.module-remove'); $closes.hide(); - $notis.show(); + $notis.show(); - $icons.trigger('stopRumble'); + $icons.trigger('stopRumble'); }; // initiate wiggling. @@ -178,21 +178,21 @@ $.extend(frappe.desktop, { - ` + `; $case.append(template); const $close = $case.find('.module-remove'); const name = $case.attr('title'); - $close.click((event) => { + $close.click(() => { // good enough to create dynamic dialogs? const dialog = new frappe.ui.Dialog({ title: __(`Hide ${name}?`) }); dialog.set_primary_action(__('Hide'), () => { frappe.call({ - method: 'frappe.desk.doctype.desktop_icon.desktop_icon.hide', - args: { name: name }, - freeze: true, + method: 'frappe.desk.doctype.desktop_icon.desktop_icon.hide', + args: { name: name }, + freeze: true, callback: (response) => { if ( response.message ) { diff --git a/frappe/desk/doctype/desktop_icon/desktop_icon.py b/frappe/desk/doctype/desktop_icon/desktop_icon.py index 59118b09b8..52461db009 100644 --- a/frappe/desk/doctype/desktop_icon/desktop_icon.py +++ b/frappe/desk/doctype/desktop_icon/desktop_icon.py @@ -413,7 +413,7 @@ def hide(name, user = None): try: set_hidden(name, user, hidden = 1) clear_desktop_icons_cache() - except: + except Exception as e: return False return True \ No newline at end of file diff --git a/frappe/public/js/frappe/form/controls/color.js b/frappe/public/js/frappe/form/controls/color.js index 7b14b45aca..6e8880a72a 100644 --- a/frappe/public/js/frappe/form/controls/color.js +++ b/frappe/public/js/frappe/form/controls/color.js @@ -40,8 +40,7 @@ frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({ const contrast = frappe.ui.color.get_contrast_color(value); this.$input.css({ - "background-color": value, - "color": contrast + "background-color": value, "color": contrast }); }, bind_events: function () { diff --git a/setup.py b/setup.py index 797d8e4826..2589c6cd0d 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ setup( include_package_data=True, install_requires=[str(ir.req) for ir in requirements], dependency_links=[str(ir._link) for ir in requirements if ir._link], - cmdclass = \ + cmdclass = \ { 'clean': CleanCommand }