Skip to content
This repository has been archived by the owner on Oct 16, 2020. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
sync change 3
  • Loading branch information
jspenguin2017 committed Dec 6, 2017
1 parent 4891f5d commit 9f6f05b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
@@ -1,2 +1,2 @@
# Patch 2017-12-06: Make build tools working on Windows 10
# Patch 2017-12-06: Make sure line endings are right on Windows 10
*.sh text eol=lf
2 changes: 1 addition & 1 deletion make-chromium.bat
@@ -1,6 +1,6 @@
@ECHO OFF

REM Patch 2017-12-06: Make build tools working on Windows 10
REM Patch 2017-12-06: Build tool shim for Windows 10
REM Need to install Python: sudo apt update && sudo apt install python -y

BASH ./tools/make-chromium.sh
Expand Down
14 changes: 2 additions & 12 deletions platform/chromium/options_ui.js
Expand Up @@ -27,18 +27,8 @@

'use strict';

vAPI.messaging.send(
'default',
{
what: 'gotoURL',
details: {
url: 'dashboard.html',
select: true,
index: -1
}
}
);
window.close();
// Patch 2017-12-06: Do not open a new tab for the dashboard
vAPI.openHere('dashboard.html');

/******************************************************************************/

Expand Down
9 changes: 9 additions & 0 deletions platform/chromium/vapi-client.js
Expand Up @@ -433,6 +433,15 @@ vAPI.messaging.Connection.prototype = {

/******************************************************************************/

// Patch 2017-12-06: Replace the current tab
vAPI.openHere = function(path) {
if (chrome.tabs !== undefined) {
chrome.tabs.update({ url: path });
}
};

/******************************************************************************/

vAPI.shutdown.add(function() {
vAPI.messaging.shutdown();
window.vAPI = undefined;
Expand Down

0 comments on commit 9f6f05b

Please sign in to comment.