Skip to content

[Main] [BUG] hasDocument should be invoked as function #2061 #2063

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.

Sign up for GitHub

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

Merged
MSNev merged 1 commit into from
May 5, 2023
Merged

[Main] [BUG] hasDocument should be invoked as function #2061 #2063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 26 additions & 26 deletions common/config/rush/npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions extensions/applicationinsights-clickanalytics-js/src/ClickAnalyticsPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
getExceptionName, isNullOrUndefined, onConfigChange, throwError, unloadComponents
} from "@microsoft/applicationinsights-core-js";
import { PropertiesPlugin } from "@microsoft/applicationinsights-properties-js";
import { hasDocument, objDeepFreeze } from "@nevware21/ts-utils";
import { getDocument, hasDocument, objDeepFreeze } from "@nevware21/ts-utils";
import {
IAutoCaptureHandler, IClickAnalyticsConfiguration, IContentHandler, ICoreData, ICustomDataTags, IPageActionTelemetry, IValueCallback
} from "./Interfaces/Datamodel";
Expand All @@ -34,7 +34,7 @@ const defaultValues: IConfigDefaults<IClickAnalyticsConfiguration> = objDeepFree
}),
pageTags: {},
coreData: cfgDfMerge<ICoreData, IClickAnalyticsConfiguration>({
referrerUri: hasDocument ? document.referrer : "",
referrerUri: hasDocument() ? getDocument().referrer : "",
requestUri: cfgDfString(),
pageName: cfgDfString(),
pageType: cfgDfString()
Expand Down
2 changes: 1 addition & 1 deletion extensions/applicationinsights-clickanalytics-js/src/DataCollector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export function getClickTarget(element: any) {
*/
export function onDomLoaded(callback: () => void) {
onDomReadyDo(() => {
if (hasDocument && document.readyState === "complete") {
if (hasDocument() && getDocument().readyState === "complete") {
callback();
} else {
let win = getWindow();
Expand Down
2 changes: 1 addition & 1 deletion extensions/applicationinsights-clickanalytics-js/src/events/WebEvent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export class WebEvent implements IUnloadableComponent {
if (!isValueAssigned(event.name)) {
event.pageName = getPageName(_self._config, overrideValues);
}
if (!isValueAssigned(event.uri) && hasWindow) {
if (!isValueAssigned(event.uri) && hasWindow()) {
event.uri = getUri(_self._config, getLocation());
}
};
Expand Down
6 changes: 3 additions & 3 deletions extensions/applicationinsights-clickanalytics-js/src/handlers/DomContentHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export class DomContentHandler implements IContentHandler {
_self.getMetadata = (): { [name: string]: string } => {
let dataTags = (_self._config || {}).dataTags;
let metaTags = {};
if (hasDocument) {
if (hasDocument()) {
metaTags = isValueAssigned(dataTags.metaDataPrefix) ? _getMetaDataFromDOM(dataTags.captureAllMetaDataContent, dataTags.metaDataPrefix, false) :
_getMetaDataFromDOM(dataTags.captureAllMetaDataContent ,"", false);
}
Expand Down Expand Up @@ -230,8 +230,8 @@ export class DomContentHandler implements IContentHandler {
function _getMetaDataFromDOM(captureAllMetaDataContent:boolean, prefix: string, removePrefix: boolean): { [name: string]: string } {
var metaElements: any;
var metaData = {};
if (hasDocument) {
metaElements = document.querySelectorAll("meta");
if (hasDocument()) {
metaElements = getDocument().querySelectorAll("meta");
for (var i = 0; i < metaElements.length; i++) {
var meta = metaElements[i];
if (meta.name) {
Expand Down