jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: Move Layout JS to Core JS Bundle

Browse Source
This commit is contained in:
Gary Sharp
2013-07-25 17:48:08 +10:00
parent 19503366c4
commit cb30257c59
7 changed files with 173 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/ClientSource/Scripts/Core.js
+68
View File
@@ -39582,3 +39582,71 @@ jQuery.fn.dataTableExt.oSort['disco_datetime-desc'] = function (a, b) {
// Change Default Menu Lengths // Change Default Menu Lengths
jQuery.fn.DataTable.defaults.aLengthMenu = [[10, 20, 50, -1], [10, 20, 50, "All"]]; jQuery.fn.DataTable.defaults.aLengthMenu = [[10, 20, 50, -1], [10, 20, 50, "All"]];
///#source 1 1 /ClientSource/Scripts/Core/disco.uicore.js
(function ($, window, document, Modernizr) {
// Document Ready
$(function () {
// Search Functionality
$('#term').watermark('Search').keypress(function (e) {
if (e.keyCode == 13) {
$(this).closest('form').submit();
}
}).focus(function () {
$(this).select();
});
// Menu Functionality
var $menu = $('#menu');
var $menuSubVisible = [];
$menu.find('li').each(function () {
var $menuItem = $(this);
var $subMenu = $menuItem.children('ul').first();
if ($subMenu.length > 0) {
$menuItem.mouseover(function () {
menuShow($menuItem, $subMenu);
}).mouseout(function () {
menuHide($menuItem, $subMenu);
}).addClass('hasSubmenu');
// Touch-enabled browser
if (Modernizr.touch) {
$menuItem.on('touchstart', function (e) {
// Already Open - allow 'click'
for (var i = 0; i < $menuSubVisible.length; i++)
if ($menuSubVisible[0] === $subMenu)
return;
// Show
menuShow($menuItem, $subMenu);
$menuSubVisible.push($subMenu);
$(document).on('click', menuTouchHide)
e.preventDefault();
});
}
};
});
function menuTouchHide() {
while ($menuSubVisible.length > 0) {
var $subMenu = $menuSubVisible.pop();
$subMenu.hide();
}
}
function menuShow($menuItem, $subMenu) {
var timeoutToken = $menuItem.data('menuTimeoutToken');
if (timeoutToken)
window.clearTimeout(timeoutToken);
if (!$subMenu.is(':visible'))
$subMenu.show();
}
function menuHide($menuItem, $subMenu) {
var timeoutToken = subMenuHideToken = window.setTimeout(function () {
$subMenu.hide();
}, 250);
$menuItem.data('menuTimeoutToken', timeoutToken);
}
});
})(jQuery, window, document, Modernizr);
Disco.Web/ClientSource/Scripts/Core.js.bundle
+1
View File
@@ -9,4 +9,5 @@
<file>/ClientSource/Scripts/Core/jquery.watermark.js</file> <file>/ClientSource/Scripts/Core/jquery.watermark.js</file>
<file>/ClientSource/Scripts/Core/jquery.dataTables.js</file> <file>/ClientSource/Scripts/Core/jquery.dataTables.js</file>
<file>/ClientSource/Scripts/Core/disco.dataTables.extensions.js</file> <file>/ClientSource/Scripts/Core/disco.dataTables.extensions.js</file>
<file>/ClientSource/Scripts/Core/disco.uicore.js</file>
</bundle> </bundle>
Disco.Web/ClientSource/Scripts/Core.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Scripts/Core.min.js.map
+3 -3
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Scripts/Core/disco.uicore.js
+67
View File
@@ -0,0 +1,67 @@
(function ($, window, document, Modernizr) {
// Document Ready
$(function () {
// Search Functionality
$('#term').watermark('Search').keypress(function (e) {
if (e.keyCode == 13) {
$(this).closest('form').submit();
}
}).focus(function () {
$(this).select();
});
// Menu Functionality
var $menu = $('#menu');
var $menuSubVisible = [];
$menu.find('li').each(function () {
var $menuItem = $(this);
var $subMenu = $menuItem.children('ul').first();
if ($subMenu.length > 0) {
$menuItem.mouseover(function () {
menuShow($menuItem, $subMenu);
}).mouseout(function () {
menuHide($menuItem, $subMenu);
}).addClass('hasSubmenu');
// Touch-enabled browser
if (Modernizr.touch) {
$menuItem.on('touchstart', function (e) {
// Already Open - allow 'click'
for (var i = 0; i < $menuSubVisible.length; i++)
if ($menuSubVisible[0] === $subMenu)
return;
// Show
menuShow($menuItem, $subMenu);
$menuSubVisible.push($subMenu);
$(document).on('click', menuTouchHide)
e.preventDefault();
});
}
};
});
function menuTouchHide() {
while ($menuSubVisible.length > 0) {
var $subMenu = $menuSubVisible.pop();
$subMenu.hide();
}
}
function menuShow($menuItem, $subMenu) {
var timeoutToken = $menuItem.data('menuTimeoutToken');
if (timeoutToken)
window.clearTimeout(timeoutToken);
if (!$subMenu.is(':visible'))
$subMenu.show();
}
function menuHide($menuItem, $subMenu) {
var timeoutToken = subMenuHideToken = window.setTimeout(function () {
$subMenu.hide();
}, 250);
$menuItem.data('menuTimeoutToken', timeoutToken);
}
});
})(jQuery, window, document, Modernizr);
Disco.Web/Views/Shared/_Layout.cshtml
+1 -40
View File
@@ -23,24 +23,7 @@
</div> </div>
<div id="headerMenu"> <div id="headerMenu">
<span>Welcome @Html.ActionLink(DiscoApplication.CurrentUser.ToString(), MVC.User.Show(DiscoApplication.CurrentUser.Id))</span> <span>Welcome @Html.ActionLink(DiscoApplication.CurrentUser.ToString(), MVC.User.Show(DiscoApplication.CurrentUser.Id))</span>
@using (Html.BeginForm(MVC.Search.Query(), FormMethod.Get)) @using (Html.BeginForm(MVC.Search.Query(), FormMethod.Get)) { @Html.TextBox("term", null, new { accesskey = "s" }) }
{
@Html.TextBox("term", null, new { accesskey = "s" })
<script type="text/javascript">
//<!--
$(function () {
$('#term').watermark('Search').keypress(function (e) {
if (e.keyCode == 13) {
$(this).closest('form').submit();
}
}).focus(function () {
$(this).select();
});
});
//-->
</script>
}
</div> </div>
</div> </div>
<nav> <nav>
@@ -71,28 +54,6 @@
<li class="sep"></li> <li class="sep"></li>
<li>@Html.ActionLink("Configuration", MVC.Config.Config.Index(), accesskey: "0")</li> <li>@Html.ActionLink("Configuration", MVC.Config.Config.Index(), accesskey: "0")</li>
</ul> </ul>
<script type="text/javascript">
$(function () {
var $menu = $('#menu');
$menu.find('li').each(function () {
var $menuItem = $(this);
var $subMenu = $menuItem.children('ul').first();
var subMenuHideToken = null;
if ($subMenu.length > 0) {
$menuItem.mouseover(function () {
if (subMenuHideToken)
window.clearTimeout(subMenuHideToken);
if (!$subMenu.is(':visible'))
$subMenu.show();
}).mouseout(function () {
subMenuHideToken = window.setTimeout(function () {
$subMenu.hide();
}, 250);
}).addClass('hasSubmenu');
};
});
});
</script>
</nav> </nav>
</header> </header>
<div id="layout_PageHeading">@CommonHelpers.Breadcrumbs(ViewBag.Title ?? string.Empty)</div> <div id="layout_PageHeading">@CommonHelpers.Breadcrumbs(ViewBag.Title ?? string.Empty)</div>
Disco.Web/Views/Shared/_Layout.generated.cs
+32 -88
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.18033 // Runtime Version:4.0.30319.18051
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -169,49 +169,20 @@ WriteLiteral("</span>\r\n");
#line hidden #line hidden
#line 26 "..\..\Views\Shared\_Layout.cshtml" #line 26 "..\..\Views\Shared\_Layout.cshtml"
using (Html.BeginForm(MVC.Search.Query(), FormMethod.Get)) using (Html.BeginForm(MVC.Search.Query(), FormMethod.Get)) {
{
#line default #line default
#line hidden #line hidden
#line 29 "..\..\Views\Shared\_Layout.cshtml" #line 26 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.TextBox("term", null, new { accesskey = "s" })); Write(Html.TextBox("term", null, new { accesskey = "s" }));
#line default #line default
#line hidden #line hidden
#line 29 "..\..\Views\Shared\_Layout.cshtml" #line 26 "..\..\Views\Shared\_Layout.cshtml"
}
#line default
#line hidden
WriteLiteral(" <script");
WriteLiteral(" type=\"text/javascript\"");
WriteLiteral(@">
//<!--
$(function () {
$('#term').watermark('Search').keypress(function (e) {
if (e.keyCode == 13) {
$(this).closest('form').submit();
}
}).focus(function () {
$(this).select();
});
});
//-->
</script>
");
#line 43 "..\..\Views\Shared\_Layout.cshtml"
}
#line default #line default
@@ -224,7 +195,7 @@ WriteLiteral(" id=\"menu\"");
WriteLiteral(">\r\n <li>"); WriteLiteral(">\r\n <li>");
#line 48 "..\..\Views\Shared\_Layout.cshtml" #line 31 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Jobs", MVC.Job.Index(), accesskey: "1")); Write(Html.ActionLink("Jobs", MVC.Job.Index(), accesskey: "1"));
@@ -233,7 +204,7 @@ WriteLiteral(">\r\n <li>");
WriteLiteral("\r\n <ul>\r\n <li>"); WriteLiteral("\r\n <ul>\r\n <li>");
#line 50 "..\..\Views\Shared\_Layout.cshtml" #line 33 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Devices Ready for Return", MVC.Job.DevicesReadyForReturn())); Write(Html.ActionLink("Devices Ready for Return", MVC.Job.DevicesReadyForReturn()));
@@ -242,7 +213,7 @@ WriteLiteral("\r\n <ul>\r\n <l
WriteLiteral("</li>\r\n <li>"); WriteLiteral("</li>\r\n <li>");
#line 51 "..\..\Views\Shared\_Layout.cshtml" #line 34 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Device Held Locations", MVC.Job.Locations())); Write(Html.ActionLink("Device Held Locations", MVC.Job.Locations()));
@@ -251,7 +222,7 @@ WriteLiteral("</li>\r\n <li>");
WriteLiteral("</li>\r\n <li>"); WriteLiteral("</li>\r\n <li>");
#line 52 "..\..\Views\Shared\_Layout.cshtml" #line 35 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Awaiting User Action", MVC.Job.AwaitingUserAction())); Write(Html.ActionLink("Awaiting User Action", MVC.Job.AwaitingUserAction()));
@@ -260,7 +231,7 @@ WriteLiteral("</li>\r\n <li>");
WriteLiteral("</li>\r\n <li>"); WriteLiteral("</li>\r\n <li>");
#line 53 "..\..\Views\Shared\_Layout.cshtml" #line 36 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Awaiting Finance", MVC.Job.AwaitingFinance())); Write(Html.ActionLink("Awaiting Finance", MVC.Job.AwaitingFinance()));
@@ -269,7 +240,7 @@ WriteLiteral("</li>\r\n <li>");
WriteLiteral("\r\n <ul>\r\n <li>"); WriteLiteral("\r\n <ul>\r\n <li>");
#line 55 "..\..\Views\Shared\_Layout.cshtml" #line 38 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Accounting Charge", MVC.Job.AwaitingFinanceCharge())); Write(Html.ActionLink("Accounting Charge", MVC.Job.AwaitingFinanceCharge()));
@@ -278,7 +249,7 @@ WriteLiteral("\r\n <ul>\r\n
WriteLiteral("</li>\r\n <li>"); WriteLiteral("</li>\r\n <li>");
#line 56 "..\..\Views\Shared\_Layout.cshtml" #line 39 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Accounting Payment", MVC.Job.AwaitingFinancePayment())); Write(Html.ActionLink("Accounting Payment", MVC.Job.AwaitingFinancePayment()));
@@ -287,7 +258,7 @@ WriteLiteral("</li>\r\n <li>");
WriteLiteral("</li>\r\n <li>"); WriteLiteral("</li>\r\n <li>");
#line 57 "..\..\Views\Shared\_Layout.cshtml" #line 40 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Agreement Breach", MVC.Job.AwaitingFinanceAgreementBreach())); Write(Html.ActionLink("Agreement Breach", MVC.Job.AwaitingFinanceAgreementBreach()));
@@ -296,7 +267,7 @@ WriteLiteral("</li>\r\n <li>");
WriteLiteral("</li>\r\n <li>"); WriteLiteral("</li>\r\n <li>");
#line 58 "..\..\Views\Shared\_Layout.cshtml" #line 41 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Insurance Processing", MVC.Job.AwaitingFinanceInsuranceProcessing())); Write(Html.ActionLink("Insurance Processing", MVC.Job.AwaitingFinanceInsuranceProcessing()));
@@ -306,7 +277,7 @@ WriteLiteral("</li>\r\n </ul>\r\n
" <li>"); " <li>");
#line 61 "..\..\Views\Shared\_Layout.cshtml" #line 44 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Awaiting Device Repair", MVC.Job.DevicesAwaitingRepair())); Write(Html.ActionLink("Awaiting Device Repair", MVC.Job.DevicesAwaitingRepair()));
@@ -315,7 +286,7 @@ WriteLiteral("</li>\r\n </ul>\r\n
WriteLiteral("</li>\r\n <li>"); WriteLiteral("</li>\r\n <li>");
#line 62 "..\..\Views\Shared\_Layout.cshtml" #line 45 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("All Open", MVC.Job.AllOpen())); Write(Html.ActionLink("All Open", MVC.Job.AllOpen()));
@@ -324,7 +295,7 @@ WriteLiteral("</li>\r\n <li>");
WriteLiteral("</li>\r\n <li>"); WriteLiteral("</li>\r\n <li>");
#line 63 "..\..\Views\Shared\_Layout.cshtml" #line 46 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Recently Closed", MVC.Job.RecentlyClosed())); Write(Html.ActionLink("Recently Closed", MVC.Job.RecentlyClosed()));
@@ -338,7 +309,7 @@ WriteLiteral(" class=\"sep\"");
WriteLiteral("></li>\r\n <li>"); WriteLiteral("></li>\r\n <li>");
#line 67 "..\..\Views\Shared\_Layout.cshtml" #line 50 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Devices", MVC.Device.Index(), accesskey: "2")); Write(Html.ActionLink("Devices", MVC.Device.Index(), accesskey: "2"));
@@ -351,7 +322,7 @@ WriteLiteral(" class=\"sep\"");
WriteLiteral("></li>\r\n <li>"); WriteLiteral("></li>\r\n <li>");
#line 69 "..\..\Views\Shared\_Layout.cshtml" #line 52 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Users", MVC.User.Index(), accesskey: "3")); Write(Html.ActionLink("Users", MVC.User.Index(), accesskey: "3"));
@@ -364,7 +335,7 @@ WriteLiteral(" class=\"moveRight\"");
WriteLiteral(">"); WriteLiteral(">");
#line 70 "..\..\Views\Shared\_Layout.cshtml" #line 53 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Public Reports", MVC.Public.Public.Index())); Write(Html.ActionLink("Public Reports", MVC.Public.Public.Index()));
@@ -377,48 +348,21 @@ WriteLiteral(" class=\"sep\"");
WriteLiteral("></li>\r\n <li>"); WriteLiteral("></li>\r\n <li>");
#line 72 "..\..\Views\Shared\_Layout.cshtml" #line 55 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Configuration", MVC.Config.Config.Index(), accesskey: "0")); Write(Html.ActionLink("Configuration", MVC.Config.Config.Index(), accesskey: "0"));
#line default #line default
#line hidden #line hidden
WriteLiteral("</li>\r\n </ul>\r\n <script"); WriteLiteral("</li>\r\n </ul>\r\n </nav>\r\n </header>\r\n <div" +
"");
WriteLiteral(" type=\"text/javascript\"");
WriteLiteral(@">
$(function () {
var $menu = $('#menu');
$menu.find('li').each(function () {
var $menuItem = $(this);
var $subMenu = $menuItem.children('ul').first();
var subMenuHideToken = null;
if ($subMenu.length > 0) {
$menuItem.mouseover(function () {
if (subMenuHideToken)
window.clearTimeout(subMenuHideToken);
if (!$subMenu.is(':visible'))
$subMenu.show();
}).mouseout(function () {
subMenuHideToken = window.setTimeout(function () {
$subMenu.hide();
}, 250);
}).addClass('hasSubmenu');
};
});
});
</script>
</nav>
</header>
<div");
WriteLiteral(" id=\"layout_PageHeading\""); WriteLiteral(" id=\"layout_PageHeading\"");
WriteLiteral(">"); WriteLiteral(">");
#line 98 "..\..\Views\Shared\_Layout.cshtml" #line 59 "..\..\Views\Shared\_Layout.cshtml"
Write(CommonHelpers.Breadcrumbs(ViewBag.Title ?? string.Empty)); Write(CommonHelpers.Breadcrumbs(ViewBag.Title ?? string.Empty));
@@ -433,7 +377,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 100 "..\..\Views\Shared\_Layout.cshtml" #line 61 "..\..\Views\Shared\_Layout.cshtml"
Write(RenderBody()); Write(RenderBody());
@@ -442,7 +386,7 @@ WriteLiteral(" ");
WriteLiteral("\r\n </section>\r\n <footer>\r\n Disco v"); WriteLiteral("\r\n </section>\r\n <footer>\r\n Disco v");
#line 103 "..\..\Views\Shared\_Layout.cshtml" #line 64 "..\..\Views\Shared\_Layout.cshtml"
Write(Disco.Web.DiscoApplication.Version); Write(Disco.Web.DiscoApplication.Version);
@@ -453,7 +397,7 @@ WriteLiteral(" ");
WriteLiteral("@ "); WriteLiteral("@ ");
#line 103 "..\..\Views\Shared\_Layout.cshtml" #line 64 "..\..\Views\Shared\_Layout.cshtml"
Write(Disco.Web.DiscoApplication.OrganisationName); Write(Disco.Web.DiscoApplication.OrganisationName);
@@ -463,7 +407,7 @@ WriteLiteral(" | <a\r\n href=\"http://discoict.com.au/\" target=\
"m.au</a> | "); "m.au</a> | ");
#line 104 "..\..\Views\Shared\_Layout.cshtml" #line 65 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Credits", MVC.Public.Public.Credits())); Write(Html.ActionLink("Credits", MVC.Public.Public.Credits()));
@@ -472,7 +416,7 @@ WriteLiteral(" | <a\r\n href=\"http://discoict.com.au/\" target=\
WriteLiteral(" | "); WriteLiteral(" | ");
#line 104 "..\..\Views\Shared\_Layout.cshtml" #line 65 "..\..\Views\Shared\_Layout.cshtml"
Write(Html.ActionLink("Licence", MVC.Public.Public.Licence())); Write(Html.ActionLink("Licence", MVC.Public.Public.Licence()));
@@ -481,13 +425,13 @@ WriteLiteral(" | ");
WriteLiteral("\r\n </footer>\r\n </div>\r\n"); WriteLiteral("\r\n </footer>\r\n </div>\r\n");
#line 107 "..\..\Views\Shared\_Layout.cshtml" #line 68 "..\..\Views\Shared\_Layout.cshtml"
#line default #line default
#line hidden #line hidden
#line 107 "..\..\Views\Shared\_Layout.cshtml" #line 68 "..\..\Views\Shared\_Layout.cshtml"
Disco.Services.Plugins.Features.UIExtension.UIExtensions.ExecuteExtensionResult(this); Disco.Services.Plugins.Features.UIExtension.UIExtensions.ExecuteExtensionResult(this);
#line default #line default