Skip to content

Commit

Permalink
Rename receiver_msp/index.html by receiver_msp/receiver_msp.html (#3941)
Browse files Browse the repository at this point in the history
  • Loading branch information
McGiverGim authored May 9, 2024
1 parent df226ea commit e8d9e50
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ function dist_rollup() {
'js/utils/common': 'src/js/utils/common.js',
'js/jquery': 'src/js/jquery.js',
'js/main': 'src/js/main.js',
'js/tabs/receiver_msp': 'src/js/tabs/receiver_msp.js',
'js/receiver_msp/receiver_msp': 'src/js/receiver_msp/receiver_msp.js',
},
plugins: [
alias({
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/js/browserReceiverMsp.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ import "../../libraries/jquery.nouislider.pips.min.css";

import "../css/theme.css";
import "../css/main.less";
import "../css/tabs/receiver_msp.less";
import "../css/receiver_msp/receiver_msp.less";
import "../css/dark-theme.less";
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import '../jqueryPlugins';
import windowWatcherUtil from "../utils/window_watchers";
import '../jqueryPlugins.js';
import windowWatcherUtil from "../utils/window_watchers.js";
import DarkTheme from '../DarkTheme.js';
import { isWeb } from "../utils/isWeb";
import { isWeb } from "../utils/isWeb.js";
import $ from 'jquery';

// This is a hack to get the i18n var of the parent, but the i18n.localizePage not works
Expand Down
4 changes: 2 additions & 2 deletions src/js/tabs/receiver.js
Original file line number Diff line number Diff line change
Expand Up @@ -548,15 +548,15 @@ receiver.initialize = function (callback) {
};

if (isWeb()) {
const createdWindow = open("./receiver_msp/", "receiver_msp", `location=no,width=${windowWidth},height=${windowHeight + (window.screen.height - window.screen.availHeight)}`);
const createdWindow = open("/receiver_msp/receiver_msp.html", "receiver_msp", `location=no,width=${windowWidth},height=${windowHeight + (window.screen.height - window.screen.availHeight)}`);
createdWindow.setRawRx = rxFunction;

DarkTheme.isDarkThemeEnabled(function(isEnabled) {
windowWatcherUtil.passValue(createdWindow, 'darkTheme', isEnabled);
});

} else {
chrome.app.window.create("/receiver_msp/index.html", {
chrome.app.window.create("/receiver_msp/receiver_msp.html", {
id: "receiver_msp",
innerBounds: {
minWidth: windowWidth, minHeight: windowHeight,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title i18n="receiverButtonSticks"></title>

<script type="module" src="/js/browserReceiverMsp.js"></script>
<script type="module" src="/js/tabs/receiver_msp.js"></script>
<script type="module" src="/js/receiver_msp/receiver_msp.js"></script>

<link type="text/css" rel="stylesheet" href="/css/opensans_webfontkit/fonts.css" media="all" />

Expand All @@ -13,7 +13,7 @@

<link type="text/css" rel="stylesheet" href="/css/theme.css" media="all" />
<link type="text/css" rel="stylesheet" href="/css/main.css" media="all" />
<link type="text/css" rel="stylesheet" href="/css/tabs/receiver_msp.css" media="all" />
<link type="text/css" rel="stylesheet" href="/css/receiver_msp/receiver_msp.css" media="all" />

<link type="text/css" rel="stylesheet" href="/css/dark-theme.css" media="all" />

Expand Down
2 changes: 1 addition & 1 deletion vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default defineConfig({
rollupOptions: {
input: {
main: resolve(__dirname, 'src/index.html'),
receiver_msp: resolve(__dirname, 'src/receiver_msp/index.html'),
receiver_msp: resolve(__dirname, 'src/receiver_msp/receiver_msp.html'),
},
},
},
Expand Down

0 comments on commit e8d9e50

Please sign in to comment.