Skip to content
Open
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: 1 addition & 3 deletions DNN Platform/Website/Default.aspx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ protected override void OnInit(EventArgs e)
var ctlSkin = this.GetSkin();

this.clientResourceController.RegisterPathNameAlias("SkinPath", this.CurrentSkinPath);

// check for and read skin package level doctype
this.SetSkinDoctype();

Expand Down Expand Up @@ -455,7 +455,6 @@ private void InitializePage()
// moved this call to OnInit to avoid incorrect CurrentSkinPath if using fallback skin
////this.clientResourceController.RegisterPathNameAlias("SkinPath", this.CurrentSkinPath);


// redirect to a specific tab based on name
if (!string.IsNullOrEmpty(this.Request.QueryString["tabname"]))
{
Expand Down Expand Up @@ -880,4 +879,3 @@ private string GetCssVariablesStylesheetCallback(CacheItemArgs args)
}
}
}

13 changes: 12 additions & 1 deletion DNN Platform/Website/Resources/Shared/scripts/dnn.jquery.js
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,16 @@

$pd.on('mousemove', function (e) {
var x = e.pageX; var y = e.pageY;
// Fix: Check if tooltip overflows the right edge of the window
var tipWidth = pd.tooltipWrapperInner.outerWidth();
var winWidth = $(window).width();

// Safety buffer of 20px for vertical scrollbar
if ((x + tipWidth) > (winWidth - 20)) {
// Clamp x position to fit inside the screen
x = winWidth - tipWidth - 20;
}

var pos = $('body').css('position');
if (pos == 'relative') y -= 38;
pd.tooltipWrapper.css({ left: x + 'px', top: y + 'px', 'z-index': '99999' });
Expand Down Expand Up @@ -4320,4 +4330,5 @@
Sys.WebForms.PageRequestManager.getInstance().add_endRequest(dnnInitCustomisedCtrls);
$(dnnInitCustomisedCtrls);
handlerSendVerificationMailLink();
})(jQuery);

})(jQuery);