Fix master & bundle x typeahead

This commit is contained in:
Samuele E. Locatelli
2018-07-18 17:22:02 +02:00
parent 662ceb331e
commit 5a9afe3edd
2 changed files with 7 additions and 3 deletions
+5 -2
View File
@@ -40,8 +40,11 @@ namespace MoonProTablet
bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include(
"~/Scripts/bootstrap.bundle.js"));
//bundles.Add(new ScriptBundle("~/bundles/instascan").Include(
// "~/Scripts/instascan.min.js"));
bundles.Add(new ScriptBundle("~/bundles/typeahead").Include(
"~/Scripts/bloodhound.min.js",
"~/Scripts/typeahead.bundle.min.js",
"~/Scripts/typeahead.jquery.min.js"
));
// abilito boundle "forzato"!
BundleTable.EnableOptimizations = true;
+2 -1
View File
@@ -16,10 +16,11 @@
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<title>MPTAB: <%: SteamWare.devicesAuthProxy.getPage(Request.Url) %></title>
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jqueryui") %>
<%: Scripts.Render("~/bundles/typeahead") %>
<%: Scripts.Render("~/bundles/BrowserWindowSize") %>
<script type="text/javascript" src="Scripts/instascan.min.js"></script>
</asp:PlaceHolder>