From adc7ad69cdbab3cd5aa2effd3a500a14d87fd54b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 25 Sep 2017 11:06:54 +0530 Subject: [PATCH] [fix] desktop notifications --- frappe/core/page/desktop/desktop.js | 4 ++-- .../js/frappe/ui/toolbar/notifications.js | 2 +- .../website/doctype/web_page/test_web_page.js | 23 +++++++++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 frappe/website/doctype/web_page/test_web_page.js diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js index eae5b7a35d..8b4c062ab6 100644 --- a/frappe/core/page/desktop/desktop.js +++ b/frappe/core/page/desktop/desktop.js @@ -212,8 +212,8 @@ $.extend(frappe.desktop, { notifier.toggle(sum ? true : false); var circle = notifier.find(".circle-text"); var text = sum || ''; - if(text > 20) { - text = '20+'; + if(text > 99) { + text = '99+'; } if(circle.length) { diff --git a/frappe/public/js/frappe/ui/toolbar/notifications.js b/frappe/public/js/frappe/ui/toolbar/notifications.js index 48095c1b8b..dbab78b986 100644 --- a/frappe/public/js/frappe/ui/toolbar/notifications.js +++ b/frappe/public/js/frappe/ui/toolbar/notifications.js @@ -43,7 +43,7 @@ frappe.ui.notifications = { // switch colour on the navbar and disable if no notifications $(".navbar-new-comments") - .html(this.total > 20 ? '20+' : this.total) + .html(this.total > 99 ? '99+' : this.total) .toggleClass("navbar-new-comments-true", this.total ? true : false) .parent().toggleClass("disabled", this.total ? false : true); }, diff --git a/frappe/website/doctype/web_page/test_web_page.js b/frappe/website/doctype/web_page/test_web_page.js new file mode 100644 index 0000000000..0ad6bd58b6 --- /dev/null +++ b/frappe/website/doctype/web_page/test_web_page.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Web Page", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Web Page + () => frappe.tests.make('Web Page', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +});