Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-06 09:20:43 +01:00
Code Issues Projects Releases Wiki Activity

sidebar is only available in newer ff versions

Browse Source
This commit is contained in:
Kyle Spearrin 2017-09-29 09:13:21 -04:00
parent 5fe2d0f461
commit 714b166035
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/services/lockService.js
View File

@ -24,8 +24,8 @@ function initLockService(self) {
self.lastLockCheck = now; self.lastLockCheck = now;
var popupOpen = chrome.extension.getViews({ type: 'popup' }).length > 0; var popupOpen = chrome.extension.getViews({ type: 'popup' }).length > 0;
var sidebarViewName = self.utilsService.sidebarViewName(); var sidebarView = sidebarViewName(self.utilsService);
var sidebarOpen = sidebarViewName && chrome.extension.getViews({ type: sidebarViewName }).length > 0; var sidebarOpen = sidebarView && chrome.extension.getViews({ type: sidebarView }).length > 0;
if (popupOpen || sidebarOpen) { if (popupOpen || sidebarOpen) {
// Do not lock // Do not lock
@ -133,4 +133,15 @@ function initLockService(self) {
return deferred.promise; return deferred.promise;
} }
function sidebarViewName(utilsService) {
if (chrome.sidebarAction && utilsService.isFirefox()) {
return 'sidebar';
}
else if (utilsService.isOpera() && (typeof opr !== 'undefined') && opr.sidebarAction) {
return 'sidebar_panel';
}
return null;
};
} }

11
src/services/utilsService.js
View File

@ -232,17 +232,6 @@ function initUtilsService() {
return theWindow.location.search && theWindow.location.search.indexOf('sidebar=true') > -1; return theWindow.location.search && theWindow.location.search.indexOf('sidebar=true') > -1;
}; };
UtilsService.prototype.sidebarViewName = function () {
if (this.isFirefox()) {
return 'sidebar';
}
else if (this.isOpera()) {
return 'sidebar_panel';
}
return null;
};
function validIpAddress(ipString) { function validIpAddress(ipString) {
var ipRegex = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/; var ipRegex = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
return ipRegex.test(ipString); return ipRegex.test(ipString);