From cef3d03f5e6eac8c01c26215b1e4c6c64dfefe73 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 5 Feb 2018 18:38:36 +0100 Subject: [PATCH] Update jQueryUI + Ajax Control Toolkit --- MP-Site/DettaglioMacchina.aspx | 108 +- MP-Site/DettaglioMacchina.aspx.cs | 348 +++--- MP-Site/MP-Site.csproj | 18 +- MP-Site/Web.config | 34 +- .../MAPO_refresh.master.designer.cs | 52 +- MP-Site/packages.config | 4 +- MP-Site/scripts/jquery-3.1.1.min.js | 4 - MP-Site/scripts/jquery-3.1.1.min.map | 1 - MP-Site/scripts/jquery-3.1.1.slim.min.js | 4 - MP-Site/scripts/jquery-3.1.1.slim.min.map | 1 - ...isense.js => jquery-3.3.1.intellisense.js} | 0 .../{jquery-3.1.1.js => jquery-3.3.1.js} | 1068 ++++++++++------- MP-Site/scripts/jquery-3.3.1.min.js | 2 + MP-Site/scripts/jquery-3.3.1.min.map | 1 + ...ery-3.1.1.slim.js => jquery-3.3.1.slim.js} | 976 ++++++++------- MP-Site/scripts/jquery-3.3.1.slim.min.js | 2 + MP-Site/scripts/jquery-3.3.1.slim.min.map | 1 + .../AjaxControlToolkit.18.1.0.nupkg | Bin 0 -> 1440456 bytes .../Content/Web.config.transform | 10 + .../lib/net40/AjaxControlToolkit.dll | Bin 0 -> 5485056 bytes packages/AjaxControlToolkit.18.1.0/readme.txt | Bin 0 -> 1562 bytes 21 files changed, 1486 insertions(+), 1148 deletions(-) delete mode 100644 MP-Site/scripts/jquery-3.1.1.min.js delete mode 100644 MP-Site/scripts/jquery-3.1.1.min.map delete mode 100644 MP-Site/scripts/jquery-3.1.1.slim.min.js delete mode 100644 MP-Site/scripts/jquery-3.1.1.slim.min.map rename MP-Site/scripts/{jquery-3.1.1.intellisense.js => jquery-3.3.1.intellisense.js} (100%) rename MP-Site/scripts/{jquery-3.1.1.js => jquery-3.3.1.js} (92%) create mode 100644 MP-Site/scripts/jquery-3.3.1.min.js create mode 100644 MP-Site/scripts/jquery-3.3.1.min.map rename MP-Site/scripts/{jquery-3.1.1.slim.js => jquery-3.3.1.slim.js} (91%) create mode 100644 MP-Site/scripts/jquery-3.3.1.slim.min.js create mode 100644 MP-Site/scripts/jquery-3.3.1.slim.min.map create mode 100644 packages/AjaxControlToolkit.18.1.0/AjaxControlToolkit.18.1.0.nupkg create mode 100644 packages/AjaxControlToolkit.18.1.0/Content/Web.config.transform create mode 100644 packages/AjaxControlToolkit.18.1.0/lib/net40/AjaxControlToolkit.dll create mode 100644 packages/AjaxControlToolkit.18.1.0/readme.txt diff --git a/MP-Site/DettaglioMacchina.aspx b/MP-Site/DettaglioMacchina.aspx index 30c3e511..69c70771 100644 --- a/MP-Site/DettaglioMacchina.aspx +++ b/MP-Site/DettaglioMacchina.aspx @@ -1,67 +1,67 @@ <%@ Page Language="C#" MasterPageFile="~/WebMasterPages/MAPO_refresh30.master" AutoEventWireup="true" Inherits="MoonPro.DettaglioMacchina" Title="Dettaglio Macchina" CodeBehind="DettaglioMacchina.aspx.cs" Async="true" %> <%@ Register Src="~/WebUserControls/mod_sequencerStati.ascx" TagName="mod_sequencerStati" - TagPrefix="uc5" %> + TagPrefix="uc5" %> <%@ Register Src="~/WebUserControls/mod_grafico.ascx" TagName="mod_grafico" TagPrefix="uc4" %> <%@ Register Src="~/WebUserControls/mod_immagineStato.ascx" TagName="mod_immagineStato" TagPrefix="uc3" %> <%@ Register Src="~/WebUserControls/mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" TagPrefix="uc2" %> <%@ Register Src="~/WebUserControls/mod_listaStatiEventi.ascx" TagName="mod_listaStatiEventi" TagPrefix="uc1" %> <%@ Register Src="WebUserControls/mod_sequencerTempiCiclo.ascx" TagName="mod_sequencerTempiCiclo" TagPrefix="uc6" %> -
-
-