diff --git a/app/package.json b/app/package.json index 79752f91..27df87fa 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "Rambox", "productName": "Rambox", - "version": "0.5.9", + "version": "0.5.10", "description": "Rambox", "main": "electron/main.js", "private": true, @@ -31,6 +31,7 @@ "dependencies": { "auto-launch-patched": "5.0.2", "tmp": "0.0.28", + "rimraf": "2.6.1", "mime": "^1.3.4", "electron-is-dev": "^0.1.1", "electron-config": "0.2.1", diff --git a/app/store/ServicesList.js b/app/store/ServicesList.js index 4d538721..915f6147 100644 --- a/app/store/ServicesList.js +++ b/app/store/ServicesList.js @@ -77,8 +77,8 @@ Ext.define('Rambox.store.ServicesList', { ,type: 'messaging' ,titleBlink: true ,manual_notifications: true + ,dont_update_unread_from_title: true ,js_unread: 'function checkUnread(){updateBadge(document.getElementById("hangout-landing-chat").lastChild.contentWindow.document.body.getElementsByClassName("ee").length)}function updateBadge(e){e>=1?rambox.setUnreadCount(e):rambox.clearUnreadCount()}setInterval(checkUnread,3000);' - //,js_unread: 'function checkUnread(){updateBadge(document.getElementById("hangout-landing-chat").lastChild.contentWindow.document.body.getElementsByClassName("ee").length)}function updateBadge(e){e>=1?document.title="("+e+") "+originalTitle:document.title=originalTitle}var originalTitle=document.title;setInterval(checkUnread,3000);' }, { id: 'hipchat' @@ -129,7 +129,7 @@ Ext.define('Rambox.store.ServicesList', { ,type: 'email' ,manual_notifications: true ,js_unread: 'function checkUnread(){updateBadge(document.getElementsByClassName("ss").length)}function updateBadge(a){a>=1?document.title="("+a+") "+originalTitle:document.title=originalTitle}var originalTitle=document.title;setInterval(checkUnread,3e3);' - ,note: 'Please be sure to sign out to Hangouts inside Inbox because cause problems. Read more...' + ,note: 'Please be sure to sign out of Hangouts inside Inbox, as it causes problems. Read more...' }, { id: 'chatwork' @@ -617,14 +617,6 @@ Ext.define('Rambox.store.ServicesList', { ,url: 'https://web.ciscospark.com/' ,type: 'messaging' }, - { - id: 'mmmelon' - ,logo: 'mmmelon.png' - ,name: 'mmmelon' - ,description: 'The ultimate tool for daily management of projects and teams. Cloud-based, web and mobile.' - ,url: '___' - ,type: 'messaging' - }, { id: 'drift' ,logo: 'drift.png' @@ -737,7 +729,6 @@ Ext.define('Rambox.store.ServicesList', { ,description: 'Manage your professional identity. Build and engage with your professional network. Access knowledge, insights and opportunities.' ,url: 'https://www.linkedin.com/messaging' ,type: 'messaging' - ,css: 'nav, .ad-banner-container, .right-rail { display: none !important; } .neptune-grid { width: 100% !important; padding:0!important; } .authentication-outlet { margin: 0 !important; }.neptune-grid.two-column .core-rail{width:100%!important;}.msg-messaging-container{height:calc(100%)!important;}.msg-conversations-container{flex:1!important;}.msg-thread{flex:3!important;max-width:none!important;min-width:none!important;}#messaging{height:calc(100vh)!important;}#msg-overlay{display:none!important;}body{overflow-y:hidden!important;}' }, { id: 'zyptonite' @@ -781,7 +772,7 @@ Ext.define('Rambox.store.ServicesList', { ,description: 'Chat with the people of your Facebook Page.' ,url: 'https://facebook.com/___/messages/' ,type: 'messaging' - ,css: '#pagelet_bluebar{display:none;}#pages_manager_top_bar_container{display:none;}#pagelet_sidebar{display:none;}#pagelet_dock{display:none;}#pages_manager_top_bar_container + div{margin:0;width:100%;}#pages_manager_top_bar_container + div > div > div{padding:0;}#pages_manager_top_bar_container + div > div > div div div:last-child{top:0!important;}' + ,js_unread: 'function remove(e){var r=document.getElementById(e);return r.parentNode.removeChild(r)}remove("pagelet_bluebar"),remove("pages_manager_top_bar_container");' }, { id: 'vk' @@ -791,7 +782,6 @@ Ext.define('Rambox.store.ServicesList', { ,url: 'https://vk.com/im' ,type: 'messaging' ,js_unread: 'function checkUnread(){updateBadge(parseInt(document.getElementById("l_msg").innerText.replace(/\D+/g,"")))}function updateBadge(e){e>=1?document.title="("+e+") "+originalTitle:document.title=originalTitle}var originalTitle=document.title;setInterval(checkUnread,3000);' - ,css: '#page_header_cont{display:none;}#side_bar{display:none;}#page_body{width:100%!important;margin-top:0;}.im-page_classic.im-page{width:700px!important;}.im-right-menu.ui_rmenu{margin-left:715px!important;}.im-page{padding-top:0!important;}.im-page_classic.im-page .im-page--header{border-top:0!important;width:700px!important;max-width:700px!important;top:0!important;margin-top:0!important;}.im-page_classic.im-page .im-page--dialogs-footer{width:700px!important;max-width:700px!important;}.im-page .im-page--dialogs{padding-top:6px!important;}.im-page_classic .im-page--chat-header{top:0!important;width:700px!important;}.im-page_classic.im-page .im-page--chat-input{width:700px!important;border-bottom:0!important;}.im-chat-input.im-chat-input_classic .im-chat-input--textarea{width:588px!important;}.im-right-menu.ui_rmenu{top:0!important;}' }, { id: 'mastodon' diff --git a/app/view/main/MainController.js b/app/view/main/MainController.js index 5c780959..5e9b9a50 100644 --- a/app/view/main/MainController.js +++ b/app/view/main/MainController.js @@ -10,10 +10,20 @@ Ext.define('Rambox.view.main.MainController', { // Set Google Analytics event ga_storage._trackPageview('/index.html', 'main'); - if ( newTab.id === 'ramboxTab' || !newTab.record.get('enabled') ) return; + if ( newTab.id === 'ramboxTab' ) { + document.title = 'Rambox'; + return; + } + + if (!newTab.record.get('enabled') ) { + return; + } var webview = newTab.down('component').el.dom; if ( webview ) webview.focus(); + + // Update the main window so it includes the active tab title. + document.title = 'Rambox - ' + newTab.title; } ,updatePositions: function(tabPanel, tab) { diff --git a/appveyor.yml b/appveyor.yml index 10d59970..292f8893 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.5.9 +version: 0.5.10 pull_requests: do_not_increment_build_number: true branches: diff --git a/electron/main.js b/electron/main.js index e0349bd2..4c564349 100644 --- a/electron/main.js +++ b/electron/main.js @@ -103,7 +103,9 @@ function handleSquirrelEvent() { // Remove desktop and start menu shortcuts spawnUpdate(['--removeShortcut', exeName]); - + // Remove user app data + require('rimraf').sync(require('electron').app.getPath('userData')); + setTimeout(app.quit, 1000); return true; diff --git a/index.html b/index.html index 5891201c..0ee207b1 100644 --- a/index.html +++ b/index.html @@ -23,8 +23,7 @@ console.info('Internet Connection', true); } else { console.info('Internet Connection', false); - alert('No Internet Connection. Please, check your internet connection and open Rambox again.'); - require('electron').remote.app.quit(); + alert('Please, check your internet connection and restart Rambox. If you use a Proxy, please go to Preferences to configure it.', 'No Internet Connection'); } } } diff --git a/package.json b/package.json index 6cce2aaf..0b25eb51 100644 --- a/package.json +++ b/package.json @@ -89,19 +89,20 @@ }, "devDependencies": { "asar": "^0.12.1", - "electron": "1.7.1", + "chai": "3.5.0", + "crowdin": "1.0.0", + "csvjson": "4.3.3", + "electron": "1.7.4", "electron-builder": "^17.8.0", "electron-builder-squirrel-windows": "15.0.0", "electron-squirrel-startup": "^1.0.0", - "chai": "3.5.0", "mocha": "3.2.0", - "spectron": "3.4.0", - "csvjson": "4.3.3", - "crowdin": "1.0.0" + "spectron": "3.4.0" }, "dependencies": { "auto-launch-patched": "5.0.2", "tmp": "0.0.28", + "rimraf": "2.6.1", "mime": "^1.3.4", "electron-is-dev": "^0.1.1", "electron-config": "0.2.1",