From d077e49a59d8c81ae2b05fb8f41c2948cf15c6d1 Mon Sep 17 00:00:00 2001 From: Hajbok Robert Date: Wed, 31 Jan 2018 12:16:44 +0000 Subject: [PATCH] Updated support to v3.8.0. --- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Abstract/PropertyParserFactoryTests.cs | 20 +- .../Properties/AssemblyInfo.cs | 2 +- .../FullCalendar.UI/Content/fullcalendar.css | 1567 +- .../Content/fullcalendar.min.css | 4 +- .../Content/fullcalendar.print.css | 154 +- .../FullCalendar.UI/FullCalendar.UI.csproj | 20 +- .../Properties/AssemblyInfo.cs | 2 +- .../Scripts/fullcalendar.helper.js | 4 +- .../Scripts/fullcalendar.helper.min.js | 2 +- .../FullCalendar.UI/Scripts/fullcalendar.js | 31804 +++++++--------- .../Scripts/fullcalendar.min.js | 15 +- .../FullCalendar.UI/Scripts/gcal.js | 570 +- .../FullCalendar.UI/Scripts/gcal.min.js | 4 +- .../Scripts/jquery-3.2.1.min.js | 4 - .../Scripts/jquery-3.2.1.min.map | 1 - .../Scripts/jquery-3.2.1.slim.min.js | 4 - .../Scripts/jquery-3.2.1.slim.min.map | 1 - ...isense.js => jquery-3.3.1.intellisense.js} | 0 .../{jquery-3.2.1.js => jquery-3.3.1.js} | 795 +- .../Scripts/jquery-3.3.1.min.js | 2 + .../Scripts/jquery-3.3.1.min.map | 1 + ...ery-3.2.1.slim.js => jquery-3.3.1.slim.js} | 747 +- .../Scripts/jquery-3.3.1.slim.min.js | 2 + .../Scripts/jquery-3.3.1.slim.min.map | 1 + .../FullCalendar.UI/Scripts/lib/moment.min.js | 8 +- .../FullCalendar.UI/Scripts/locale-all.js | 11 +- .../FullCalendar.UI/Scripts/locale/af.js | 2 +- .../FullCalendar.UI/Scripts/locale/ar-dz.js | 2 +- .../FullCalendar.UI/Scripts/locale/ar-kw.js | 2 +- .../FullCalendar.UI/Scripts/locale/ar-ly.js | 2 +- .../FullCalendar.UI/Scripts/locale/ar-ma.js | 2 +- .../FullCalendar.UI/Scripts/locale/ar-sa.js | 2 +- .../FullCalendar.UI/Scripts/locale/ar-tn.js | 2 +- .../FullCalendar.UI/Scripts/locale/ar.js | 2 +- .../FullCalendar.UI/Scripts/locale/bg.js | 2 +- .../FullCalendar.UI/Scripts/locale/ca.js | 2 +- .../FullCalendar.UI/Scripts/locale/cs.js | 2 +- .../FullCalendar.UI/Scripts/locale/da.js | 2 +- .../FullCalendar.UI/Scripts/locale/de-at.js | 2 +- .../FullCalendar.UI/Scripts/locale/de-ch.js | 2 +- .../FullCalendar.UI/Scripts/locale/de.js | 2 +- .../FullCalendar.UI/Scripts/locale/el.js | 2 +- .../FullCalendar.UI/Scripts/locale/en-au.js | 2 +- .../FullCalendar.UI/Scripts/locale/en-ca.js | 2 +- .../FullCalendar.UI/Scripts/locale/en-gb.js | 2 +- .../FullCalendar.UI/Scripts/locale/en-ie.js | 2 +- .../FullCalendar.UI/Scripts/locale/en-nz.js | 2 +- .../FullCalendar.UI/Scripts/locale/es-do.js | 2 +- .../FullCalendar.UI/Scripts/locale/es-us.js | 1 + .../FullCalendar.UI/Scripts/locale/es.js | 2 +- .../FullCalendar.UI/Scripts/locale/et.js | 2 +- .../FullCalendar.UI/Scripts/locale/eu.js | 2 +- .../FullCalendar.UI/Scripts/locale/fa.js | 2 +- .../FullCalendar.UI/Scripts/locale/fi.js | 2 +- .../FullCalendar.UI/Scripts/locale/fr-ca.js | 2 +- .../FullCalendar.UI/Scripts/locale/fr-ch.js | 2 +- .../FullCalendar.UI/Scripts/locale/fr.js | 2 +- .../FullCalendar.UI/Scripts/locale/gl.js | 2 +- .../FullCalendar.UI/Scripts/locale/he.js | 2 +- .../FullCalendar.UI/Scripts/locale/hi.js | 2 +- .../FullCalendar.UI/Scripts/locale/hr.js | 2 +- .../FullCalendar.UI/Scripts/locale/hu.js | 2 +- .../FullCalendar.UI/Scripts/locale/id.js | 2 +- .../FullCalendar.UI/Scripts/locale/is.js | 2 +- .../FullCalendar.UI/Scripts/locale/it.js | 2 +- .../FullCalendar.UI/Scripts/locale/ja.js | 2 +- .../FullCalendar.UI/Scripts/locale/kk.js | 2 +- .../FullCalendar.UI/Scripts/locale/ko.js | 2 +- .../FullCalendar.UI/Scripts/locale/lb.js | 2 +- .../FullCalendar.UI/Scripts/locale/lt.js | 2 +- .../FullCalendar.UI/Scripts/locale/lv.js | 2 +- .../FullCalendar.UI/Scripts/locale/mk.js | 2 +- .../FullCalendar.UI/Scripts/locale/ms-my.js | 2 +- .../FullCalendar.UI/Scripts/locale/ms.js | 2 +- .../FullCalendar.UI/Scripts/locale/nb.js | 2 +- .../FullCalendar.UI/Scripts/locale/nl-be.js | 2 +- .../FullCalendar.UI/Scripts/locale/nl.js | 2 +- .../FullCalendar.UI/Scripts/locale/nn.js | 2 +- .../FullCalendar.UI/Scripts/locale/pl.js | 2 +- .../FullCalendar.UI/Scripts/locale/pt-br.js | 2 +- .../FullCalendar.UI/Scripts/locale/pt.js | 2 +- .../FullCalendar.UI/Scripts/locale/ro.js | 2 +- .../FullCalendar.UI/Scripts/locale/ru.js | 2 +- .../FullCalendar.UI/Scripts/locale/sk.js | 2 +- .../FullCalendar.UI/Scripts/locale/sl.js | 2 +- .../FullCalendar.UI/Scripts/locale/sq.js | 1 + .../FullCalendar.UI/Scripts/locale/sr-cyrl.js | 2 +- .../FullCalendar.UI/Scripts/locale/sr.js | 2 +- .../FullCalendar.UI/Scripts/locale/sv.js | 2 +- .../FullCalendar.UI/Scripts/locale/th.js | 2 +- .../FullCalendar.UI/Scripts/locale/tr.js | 2 +- .../FullCalendar.UI/Scripts/locale/uk.js | 2 +- .../FullCalendar.UI/Scripts/locale/vi.js | 2 +- .../FullCalendar.UI/Scripts/locale/zh-cn.js | 2 +- .../FullCalendar.UI/Scripts/locale/zh-tw.js | 2 +- .../Scripts/moment-with-locales.js | 386 +- .../Scripts/moment-with-locales.min.js | 2 +- .../FullCalendar.UI/Scripts/moment.js | 42 +- .../FullCalendar.UI/Scripts/moment.min.js | 2 +- .../Views/Home/_FullCalendar.cshtml | 16 +- .../FullCalendar.UI/packages.config | 8 +- .../Abstract/PropertyParserFactory.cs | 3 +- .../FullCalendar/FullCalendarParameters.cs | 18 +- .../FullCalendar/Properties/AssemblyInfo.cs | 6 +- .../Scripts/fullcalendar.helper.js | 4 +- .../Scripts/fullcalendar.helper.min.js | 2 +- README.md | 2 +- 109 files changed, 16899 insertions(+), 19485 deletions(-) delete mode 100644 FullCalendarMVC/FullCalendar.UI/Scripts/jquery-3.2.1.min.js delete mode 100644 FullCalendarMVC/FullCalendar.UI/Scripts/jquery-3.2.1.min.map delete mode 100644 FullCalendarMVC/FullCalendar.UI/Scripts/jquery-3.2.1.slim.min.js delete mode 100644 FullCalendarMVC/FullCalendar.UI/Scripts/jquery-3.2.1.slim.min.map rename FullCalendarMVC/FullCalendar.UI/Scripts/{jquery-3.2.1.intellisense.js => jquery-3.3.1.intellisense.js} (100%) rename FullCalendarMVC/FullCalendar.UI/Scripts/{jquery-3.2.1.js => jquery-3.3.1.js} (94%) create mode 100644 FullCalendarMVC/FullCalendar.UI/Scripts/jquery-3.3.1.min.js create mode 100644 FullCalendarMVC/FullCalendar.UI/Scripts/jquery-3.3.1.min.map rename FullCalendarMVC/FullCalendar.UI/Scripts/{jquery-3.2.1.slim.js => jquery-3.3.1.slim.js} (93%) create mode 100644 FullCalendarMVC/FullCalendar.UI/Scripts/jquery-3.3.1.slim.min.js create mode 100644 FullCalendarMVC/FullCalendar.UI/Scripts/jquery-3.3.1.slim.min.map create mode 100644 FullCalendarMVC/FullCalendar.UI/Scripts/locale/es-us.js create mode 100644 FullCalendarMVC/FullCalendar.UI/Scripts/locale/sq.js diff --git a/FullCalendarMVC/FullCalendar.MVC4/Properties/AssemblyInfo.cs b/FullCalendarMVC/FullCalendar.MVC4/Properties/AssemblyInfo.cs index b24e94e..f6663b6 100644 --- a/FullCalendarMVC/FullCalendar.MVC4/Properties/AssemblyInfo.cs +++ b/FullCalendarMVC/FullCalendar.MVC4/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("FullCalendar.MVC4")] -[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyCopyright("Copyright © 2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.4.0")] -[assembly: AssemblyFileVersion("1.0.4.0")] +[assembly: AssemblyVersion("1.0.5.0")] +[assembly: AssemblyFileVersion("1.0.5.0")] diff --git a/FullCalendarMVC/FullCalendar.MVC5/Properties/AssemblyInfo.cs b/FullCalendarMVC/FullCalendar.MVC5/Properties/AssemblyInfo.cs index ff926e8..f40a193 100644 --- a/FullCalendarMVC/FullCalendar.MVC5/Properties/AssemblyInfo.cs +++ b/FullCalendarMVC/FullCalendar.MVC5/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("FullCalendar.MVC5")] -[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyCopyright("Copyright © 2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.4.0")] -[assembly: AssemblyFileVersion("1.0.4.0")] +[assembly: AssemblyVersion("1.0.5.0")] +[assembly: AssemblyFileVersion("1.0.5.0")] diff --git a/FullCalendarMVC/FullCalendar.Tests/Abstract/PropertyParserFactoryTests.cs b/FullCalendarMVC/FullCalendar.Tests/Abstract/PropertyParserFactoryTests.cs index 0300c76..d8d6dba 100644 --- a/FullCalendarMVC/FullCalendar.Tests/Abstract/PropertyParserFactoryTests.cs +++ b/FullCalendarMVC/FullCalendar.Tests/Abstract/PropertyParserFactoryTests.cs @@ -457,13 +457,29 @@ public void GetPropertyParser_TimeFormatIsSent_StringPropertyParserIsCreated() } [Test] - public void GetPropertyParser_ColumnFormatIsSent_StringPropertyParserIsCreated() + public void GetPropertyParser_ColumnHeaderFormatIsSent_StringPropertyParserIsCreated() { - PropertyInfo property = typeof(FullCalendarParameters).GetProperties().Single(x => x.Name == nameof(FullCalendarParameters.ColumnFormat)); + PropertyInfo property = typeof(FullCalendarParameters).GetProperties().Single(x => x.Name == nameof(FullCalendarParameters.ColumnHeaderFormat)); IPropertyParser propertyParser = PropertyParserFactory.GetPropertyParser(property); propertyParser.Should().BeOfType(); } + [Test] + public void GetPropertyParser_ColumnHeaderTextIsSent_FunctionPropertyParserIsCreated() + { + PropertyInfo property = typeof(FullCalendarParameters).GetProperties().Single(x => x.Name == nameof(FullCalendarParameters.ColumnHeaderText)); + IPropertyParser propertyParser = PropertyParserFactory.GetPropertyParser(property); + propertyParser.Should().BeOfType(); + } + + [Test] + public void GetPropertyParser_ColumnHeaderHtmlIsSent_FunctionPropertyParserIsCreated() + { + PropertyInfo property = typeof(FullCalendarParameters).GetProperties().Single(x => x.Name == nameof(FullCalendarParameters.ColumnHeaderHtml)); + IPropertyParser propertyParser = PropertyParserFactory.GetPropertyParser(property); + propertyParser.Should().BeOfType(); + } + [Test] public void GetPropertyParser_TitleFormatIsSent_StringPropertyParserIsCreated() { diff --git a/FullCalendarMVC/FullCalendar.Tests/Properties/AssemblyInfo.cs b/FullCalendarMVC/FullCalendar.Tests/Properties/AssemblyInfo.cs index 2773a3b..d34e9f3 100644 --- a/FullCalendarMVC/FullCalendar.Tests/Properties/AssemblyInfo.cs +++ b/FullCalendarMVC/FullCalendar.Tests/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("FullCalendar.Tests")] -[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyCopyright("Copyright © 2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/FullCalendarMVC/FullCalendar.UI/Content/fullcalendar.css b/FullCalendarMVC/FullCalendar.UI/Content/fullcalendar.css index 71720d2..28ff058 100644 --- a/FullCalendarMVC/FullCalendar.UI/Content/fullcalendar.css +++ b/FullCalendarMVC/FullCalendar.UI/Content/fullcalendar.css @@ -1,1494 +1,1265 @@ /*! - * FullCalendar v3.5.1 Stylesheet + * FullCalendar v3.8.0 * Docs & License: https://fullcalendar.io/ * (c) 2017 Adam Shaw */ - - .fc { - direction: ltr; - text-align: left; -} + direction: ltr; + text-align: left; } .fc-rtl { - text-align: right; -} - -body .fc { /* extra precedence to overcome jqui */ - font-size: 1em; -} + text-align: right; } +body .fc { + /* extra precedence to overcome jqui */ + font-size: 1em; } /* Colors --------------------------------------------------------------------------------------------------*/ +.fc-highlight { + /* when user is selecting cells */ + background: #bce8f1; + opacity: .3; } +.fc-bgevent { + /* default look for background events */ + background: #8fdf82; + opacity: .3; } -.fc-highlight { /* when user is selecting cells */ - background: #bce8f1; - opacity: .3; -} - -.fc-bgevent { /* default look for background events */ - background: rgb(143, 223, 130); - opacity: .3; -} - -.fc-nonbusiness { /* default look for non-business-hours areas */ - /* will inherit .fc-bgevent's styles */ - background: #d7d7d7; -} - +.fc-nonbusiness { + /* default look for non-business-hours areas */ + /* will inherit .fc-bgevent's styles */ + background: #d7d7d7; } /* Buttons (styled