Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: cleanup from #7029 #7328

Merged
merged 4 commits into from
Dec 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/api/objects/object-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ function makeKeyString(identifier) {
return identifier.key;
}

return [identifier.namespace.replace(/:/g, '\\:'), identifier.key].join(':');
return [identifier.namespace.replace(/\\/g, '\\\\').replace(/:/g, '\\:'), identifier.key].join(
':'
);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/autoflow/AutoflowTabularPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default function (options) {
return !options || options.type === d.type;
},
view: function (domainObject) {
return new AutoflowTabularView(domainObject, openmct, document);
return new AutoflowTabularView(domainObject, openmct);
}
});
};
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/conditionWidget/components/ConditionWidget.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@
</template>

<script>
import { sanitizeUrl } from '@braintree/sanitize-url';

import tooltipHelpers from '../../../api/tooltips/tooltipMixins';
const sanitizeUrl = require('@braintree/sanitize-url').sanitizeUrl;

export default {
mixins: [tooltipHelpers],
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/hyperlink/HyperlinkLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</template>

<script>
const sanitizeUrl = require('@braintree/sanitize-url').sanitizeUrl;
import { sanitizeUrl } from '@braintree/sanitize-url';

export default {
inject: ['domainObject'],
Expand Down
5 changes: 2 additions & 3 deletions src/plugins/timer/components/TimerComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,11 @@
</template>

<script>
import momentDurationFormatSetup from 'moment-duration-format';
import moment from 'moment-timezone';
import raf from 'utils/raf';

import throttle from '../../../utils/throttle';

const moment = require('moment-timezone');
const momentDurationFormatSetup = require('moment-duration-format');
const refreshRateSeconds = 2;

momentDurationFormatSetup(moment);
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/webPage/components/WebPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</template>

<script>
const sanitizeUrl = require('@braintree/sanitize-url').sanitizeUrl;
import { sanitizeUrl } from '@braintree/sanitize-url';

export default {
inject: ['openmct', 'domainObject'],
Expand Down
9 changes: 4 additions & 5 deletions src/ui/router/ApplicationRouter.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global module*/

const LocationBar = require('location-bar');
const EventEmitter = require('EventEmitter');
const _ = require('lodash');
import EventEmitter from 'EventEmitter';
import LocationBar from 'location-bar';
import _ from 'lodash';

class ApplicationRouter extends EventEmitter {
/**
Expand Down Expand Up @@ -430,4 +429,4 @@ function paramsToObject(searchParams) {
return params;
}

module.exports = ApplicationRouter;
export default ApplicationRouter;