From c15d1d4f2c0bc8455a66ab40e5561d01c696514f Mon Sep 17 00:00:00 2001 From: Ramiro Saenz Date: Wed, 18 Jan 2017 21:16:55 -0300 Subject: [PATCH] Fixed Telegram unread Fixes #485 --- app/model/Service.js | 21 +++++++++------------ app/store/ServicesList.js | 4 ++-- app/ux/WebView.js | 7 +++++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/model/Service.js b/app/model/Service.js index e7fbdc59..a6711f48 100644 --- a/app/model/Service.js +++ b/app/model/Service.js @@ -37,18 +37,15 @@ Ext.define('Rambox.model.Service', { name: 'muted' ,type: 'boolean' ,defaultValue: false - }, - { - name: 'displayTabUnreadCounter', - type: 'boolean', - defaultValue: true - }, - { - name: 'includeInGlobalUnreadCounter', - type: 'boolean', - defaultValue: true - }, - { + },{ + name: 'displayTabUnreadCounter' + ,type: 'boolean' + ,defaultValue: true + },{ + name: 'includeInGlobalUnreadCounter' + ,type: 'boolean' + ,defaultValue: true + },{ name: 'trust' ,type: 'boolean' ,defaultValue: false diff --git a/app/store/ServicesList.js b/app/store/ServicesList.js index 2b667323..320254f9 100644 --- a/app/store/ServicesList.js +++ b/app/store/ServicesList.js @@ -94,8 +94,8 @@ Ext.define('Rambox.store.ServicesList', { ,description: 'Telegram is a messaging app with a focus on speed and security. It’s super-fast, simple, secure and free.' ,url: 'https://web.telegram.org/' ,type: 'messaging' - ,titleBlink: true - ,js_unread: 'function checkUnread(){var e=document.getElementsByClassName("im_dialog_badge badge"),t=0;for(i=0;i=1?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3000);' + ,dont_update_unread_from_title: true }, { id: 'wechat' diff --git a/app/ux/WebView.js b/app/ux/WebView.js index 8cdfa066..885a21c2 100644 --- a/app/ux/WebView.js +++ b/app/ux/WebView.js @@ -250,13 +250,14 @@ Ext.define('Rambox.ux.WebView',{ webview.executeJavaScript(js_unread); } } - + /* // Prevent Title blinking (some services have) and only allow when the title have an unread regex match: "(3) Title" if ( Ext.getStore('ServicesList').getById(me.record.get('type')).get('titleBlink') ) { var js_preventBlink = 'var originalTitle=document.title;Object.defineProperty(document,"title",{configurable:!0,set:function(a){null===a.match(new RegExp("[(]([0-9•]+)[)][ ](.*)","g"))&&a!==originalTitle||(document.getElementsByTagName("title")[0].innerHTML=a)},get:function(){return document.getElementsByTagName("title")[0].innerHTML}});'; console.log(js_preventBlink); webview.executeJavaScript(js_preventBlink); } + */ console.groupEnd(); // Scroll always to top (bug) @@ -308,7 +309,7 @@ Ext.define('Rambox.ux.WebView',{ count = count === '•' ? count : Ext.isArray(count.match(/\d+/g)) ? count.match(/\d+/g).join("") : count.match(/\d+/g); // Some services have special characters. Example: (•) count = count === null ? '0' : count; - me.setUnreadCount(count); + me.setUnreadCount(count); }); } @@ -317,9 +318,11 @@ Ext.define('Rambox.ux.WebView',{ }); if(ipc.sendSync('getConfig').spellcheck) { + /* var webFrame = require('electron').webFrame; var SpellCheckProvider = require('electron-spell-check-provider'); webFrame.setSpellCheckProvider('en-US', true, new SpellCheckProvider('en-US')); + */ } },