Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
Online-Werkzeuge
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Peter Gerwinski
Online-Werkzeuge
Commits
6889b392
Commit
6889b392
authored
4 years ago
by
Peter Gerwinski
Browse files
Options
Downloads
Patches
Plain Diff
Jitsi-Meet-App: URL per Environment-Variable vorgeben
parent
5991c334
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
jitsi-meet-electron-pg-20200629.diff
+104
-0
104 additions, 0 deletions
jitsi-meet-electron-pg-20200629.diff
with
104 additions
and
0 deletions
jitsi-meet-electron-pg-20200629.diff
0 → 100644
+
104
−
0
View file @
6889b392
diff --git a/app/features/conference/components/Conference.js b/app/features/conference/components/Conference.js
index b87fc02..9389894 100644
--- a/app/features/conference/components/Conference.js
+++ b/app/features/conference/components/Conference.js
@@ -295,6 +295,7 @@
class Conference extends Component<Props, State> {
* @private
*/
_onVideoConferenceEnded(event: Event) {
+ window.jitsiNodeAPI.ipc.send('conference-ended');
this.props.dispatch(conferenceEnded(this._conference));
this._navigateToHome(event);
}
diff --git a/app/features/welcome/components/Welcome.js b/app/features/welcome/components/Welcome.js
index f0bb138..20c17aa 100644
--- a/app/features/welcome/components/Welcome.js
+++ b/app/features/welcome/components/Welcome.js
@@ -111,9 +111,16 @@
class Welcome extends Component<Props, State> {
* @returns {void}
*/
componentDidMount() {
- this.props.dispatch(startOnboarding('welcome-page'));
-
- this._updateRoomname();
+ var urlParams = new URLSearchParams(window.location.search);
+ var directUrl = urlParams.get('url');
+ if (directUrl.length > 0) {
+ this.state.url = directUrl;
+ this._onJoin();
+ }
+ else {
+ this.props.dispatch(startOnboarding('welcome-page'));
+ this._updateRoomname();
+ }
}
/**
diff --git a/app/preload/preload.js b/app/preload/preload.js
index 85064ea..4d214cd 100644
--- a/app/preload/preload.js
+++ b/app/preload/preload.js
@@ -27,7 +27,7 @@
function openExternalLink(link) {
}
}
-const whitelistedIpcChannels = [ 'protocol-data-msg', 'renderer-ready' ];
+const whitelistedIpcChannels = [ 'protocol-data-msg', 'renderer-ready', 'conference-ended' ];
window.jitsiNodeAPI = {
createElectronStorage,
diff --git a/main.js b/main.js
index 0ca6cde..b4eee89 100644
--- a/main.js
+++ b/main.js
@@ -173,7 +173,8 @@
function createJitsiMeetWindow() {
const indexURL = URL.format({
pathname: path.resolve(basePath, './build/index.html'),
protocol: 'file:',
- slashes: true
+ slashes: true,
+ search: 'url=' + (process.env.URL ? process.env.URL : '')
});
// Options used when creating the main Jitsi Meet window.
@@ -356,3 +357,13 @@
ipcMain.on('renderer-ready', () => {
.send('protocol-data-msg', protocolDataForFrontApp);
}
});
+
+/**
+ * When a URL has been specified via the URL environment variable,
+ * exit the program after the conference ended.
+ */
+ipcMain.on('conference-ended', () => {
+ if (process.env.URL) {
+ app.quit();
+ }
+});
diff --git a/resources/icons/icon_128x128.png b/resources/icons/icon_128x128.png
old mode 100755
new mode 100644
diff --git a/resources/icons/icon_16x16.png b/resources/icons/icon_16x16.png
old mode 100755
new mode 100644
diff --git a/resources/icons/icon_24x24.png b/resources/icons/icon_24x24.png
old mode 100755
new mode 100644
diff --git a/resources/icons/icon_256x256.png b/resources/icons/icon_256x256.png
old mode 100755
new mode 100644
diff --git a/resources/icons/icon_32x32.png b/resources/icons/icon_32x32.png
old mode 100755
new mode 100644
diff --git a/resources/icons/icon_48x48.png b/resources/icons/icon_48x48.png
old mode 100755
new mode 100644
diff --git a/resources/icons/icon_512x512.png b/resources/icons/icon_512x512.png
old mode 100755
new mode 100644
diff --git a/resources/icons/icon_64x64.png b/resources/icons/icon_64x64.png
old mode 100755
new mode 100644
diff --git a/resources/icons/icon_96x96.png b/resources/icons/icon_96x96.png
old mode 100755
new mode 100644
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment