yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work on keepalive refactoring

Browse Source 
[TFS Changeset #79320]
This commit is contained in:
hartvig
2010-11-03 08:19:39 +00:00
parent 7f565e8df4
commit 4d76c17b02
4 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
umbraco/presentation/umbraco/masterpages/umbracoDialog.Master
View File

@@ -16,6 +16,8 @@
<umb:JsInclude ID="JsInclude3" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient" Priority="1" />
<umb:JsInclude ID="JsInclude4" runat="server" FilePath="Application/UmbracoClientManager.js" PathNameAlias="UmbracoClient" Priority="2" />
<umb:JsInclude ID="JsInclude2" runat="server" FilePath="ui/default.js" PathNameAlias="UmbracoClient" Priority="5" />
<umb:JsInclude ID="JsInclude5" runat="server" FilePath="Application/jQuery/jquery.idle-timer.js"
PathNameAlias="UmbracoClient" Priority="1" />
<asp:ContentPlaceHolder ID="head" runat="server"></asp:ContentPlaceHolder>
</head>

9
umbraco/presentation/umbraco/masterpages/umbracoDialog.Master.designer.cs generated
View File

@@ -75,6 +75,15 @@ namespace umbraco.presentation.masterpages {
/// </remarks>
protected global::ClientDependency.Core.Controls.JsInclude JsInclude2;
/// <summary>
/// JsInclude5 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::ClientDependency.Core.Controls.JsInclude JsInclude5;
/// <summary>
/// head control.
/// </summary>

23
umbraco/presentation/umbraco/masterpages/umbracoPage.Master
View File

@@ -7,7 +7,6 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title></title>
<cc1:UmbracoClientDependencyLoader runat="server" ID="ClientLoader" />
<umb:CssInclude ID="CssInclude1" runat="server" FilePath="ui/default.css" PathNameAlias="UmbracoClient" />
<umb:CssInclude ID="CssInclude2" runat="server" FilePath="modal/style.css" PathNameAlias="UmbracoClient" />
@@ -17,8 +16,8 @@
Priority="0" />
<umb:JsInclude ID="JsInclude8" runat="server" FilePath="ui/jqueryui.js" PathNameAlias="UmbracoClient"
Priority="1" />
<umb:JsInclude ID="JsInclude9" runat="server" FilePath="Application/jQuery/jquery.cookie.js" PathNameAlias="UmbracoClient"
Priority="1" />
<umb:JsInclude ID="JsInclude9" runat="server" FilePath="Application/jQuery/jquery.cookie.js"
PathNameAlias="UmbracoClient" Priority="1" />
<umb:JsInclude ID="JsInclude4" runat="server" FilePath="Application/UmbracoApplicationActions.js"
PathNameAlias="UmbracoClient" Priority="2" />
<umb:JsInclude ID="JsInclude5" runat="server" FilePath="Application/UmbracoUtils.js"
@@ -29,12 +28,12 @@
Priority="10" />
<umb:JsInclude ID="JsInclude3" runat="server" FilePath="ui/default.js" PathNameAlias="UmbracoClient"
Priority="10" />
<umb:JsInclude ID="JsInclude10" runat="server" FilePath="Application/jQuery/jquery.idle-timer.js"
PathNameAlias="UmbracoClient" Priority="1" />
<asp:ContentPlaceHolder ID="head" runat="server">
</asp:ContentPlaceHolder>
</head>
<body class="umbracoPage">
<form id="form1" runat="server">
<asp:ScriptManager ID="ScriptManager1" EnablePartialRendering="true" runat="server">
</asp:ScriptManager>
@@ -43,5 +42,19 @@
</form>
<asp:ContentPlaceHolder ID="footer" runat="server">
</asp:ContentPlaceHolder>
<script type="text/javascript">
// add idle timer
var stimeout = 60000;
jQuery('.umbracoPage').bind("idle.idleTimer", function () {
UmbClientMgr.mainWindow().jQuery('#umbracoMainPageBody').trigger('idle.idleTimer');
});
jQuery('.umbracoPage').bind("active.idleTimer", function () {
UmbClientMgr.mainWindow().jQuery('#umbracoMainPageBody').trigger('active.idleTimer');
});
jQuery('.umbracoPage').idleTimer(stimeout);
</script>
</body>
</html>

9
umbraco/presentation/umbraco/masterpages/umbracoPage.Master.designer.cs generated
View File

@@ -120,6 +120,15 @@ namespace umbraco.presentation.masterpages {
/// </remarks>
protected global::ClientDependency.Core.Controls.JsInclude JsInclude3;
/// <summary>
/// JsInclude10 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::ClientDependency.Core.Controls.JsInclude JsInclude10;
/// <summary>
/// head control.
/// </summary>