From 5a9afe3edd470846c24bc303dca0caa79f47d25b Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 18 Jul 2018 17:22:02 +0200 Subject: [PATCH] Fix master & bundle x typeahead --- MP-TAB/App_Start/BundleConfig.cs | 7 +++++-- MP-TAB/WebMasterPages/Bootstrap.Master | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/MP-TAB/App_Start/BundleConfig.cs b/MP-TAB/App_Start/BundleConfig.cs index e7d03cf0..f9a407bc 100644 --- a/MP-TAB/App_Start/BundleConfig.cs +++ b/MP-TAB/App_Start/BundleConfig.cs @@ -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; diff --git a/MP-TAB/WebMasterPages/Bootstrap.Master b/MP-TAB/WebMasterPages/Bootstrap.Master index 028a1afe..6da42886 100644 --- a/MP-TAB/WebMasterPages/Bootstrap.Master +++ b/MP-TAB/WebMasterPages/Bootstrap.Master @@ -16,10 +16,11 @@ MPTAB: <%: SteamWare.devicesAuthProxy.getPage(Request.Url) %> - + <%: Scripts.Render("~/bundles/modernizr") %> <%: Scripts.Render("~/bundles/jquery") %> <%: Scripts.Render("~/bundles/jqueryui") %> + <%: Scripts.Render("~/bundles/typeahead") %> <%: Scripts.Render("~/bundles/BrowserWindowSize") %>