Skip to content

Commit 3ef64b7

Browse files
authored
Merge pull request #2 from vairamuthuR/master
Volume 4, 2018 SP1 (v16.4.52) released
2 parents 7865f1a + 692e071 commit 3ef64b7

File tree

922 files changed

+223889
-87689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

922 files changed

+223889
-87689
lines changed

Controllers/Accordion/AjaxController.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
using System.Threading.Tasks;
55
using Microsoft.AspNetCore.Mvc;
66

7-
// For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
8-
97
namespace EJ2CoreSampleBrowser.Controllers
108
{
119
public partial class AccordionController : Controller

Controllers/Accordion/DefaultFunctionalitiesController.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
using System.Threading.Tasks;
55
using Microsoft.AspNetCore.Mvc;
66

7-
// For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
8-
97
namespace EJ2CoreSampleBrowser.Controllers
108
{
119
public partial class AccordionController : Controller

Controllers/Accordion/IconsController.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
using System.Threading.Tasks;
55
using Microsoft.AspNetCore.Mvc;
66

7-
// For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
8-
97
namespace EJ2CoreSampleBrowser.Controllers
108
{
119
public partial class AccordionController : Controller

Controllers/Accordion/RtlController.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
using System.Threading.Tasks;
55
using Microsoft.AspNetCore.Mvc;
66

7-
// For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
8-
97
namespace EJ2CoreSampleBrowser.Controllers
108
{
119
public partial class AccordionController : Controller

Controllers/Button/CheckBoxForController.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Linq;
44
using System.Threading.Tasks;
55
using Microsoft.AspNetCore.Mvc;
6-
using EJ2CoreSampleBrowser.Models;
6+
using System.ComponentModel.DataAnnotations;
77

88
namespace EJ2CoreSampleBrowser.Controllers
99
{
@@ -21,4 +21,9 @@ public IActionResult CheckBoxFor(CheckBoxModel model)
2121
return View(model);
2222
}
2323
}
24+
public class CheckBoxModel
25+
{
26+
[Range(typeof(bool), "true", "true", ErrorMessage = "You need to agree to the Terms and Conditions")]
27+
public bool check { get; set; }
28+
}
2429
}

Controllers/Button/ProgressButtonController.cs

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,25 @@ public partial class ButtonController : Controller
1111
{
1212
public IActionResult ProgressButton()
1313
{
14-
List<object> spinSettings = new List<object>();
15-
spinSettings.Add(new {
16-
position= "Right"
17-
});
18-
spinSettings.Add(new {
19-
position= "Top"
20-
});
21-
spinSettings.Add(new {
22-
position= "Bottom"
23-
});
24-
spinSettings.Add(new {
25-
position= "Center"
26-
});
27-
ViewBag.spinSettings = spinSettings;
28-
List<object> animationSettings = new List<object>();
29-
animationSettings.Add(new {
30-
effect= "SlideLeft"
31-
});
32-
animationSettings.Add(new {
33-
effect= "SlideRight"
34-
});
35-
animationSettings.Add(new {
36-
effect= "ZoomIn"
37-
});
38-
animationSettings.Add(new {
39-
effect= "ZoomOut"
40-
});
41-
ViewBag.animationSettings = animationSettings;
14+
ProgressButtonSpinSettings spinRight = new ProgressButtonSpinSettings() { Position = SpinPosition.Right };
15+
ProgressButtonSpinSettings spinTop = new ProgressButtonSpinSettings() { Position = SpinPosition.Top };
16+
ProgressButtonSpinSettings spinBottom = new ProgressButtonSpinSettings() { Position = SpinPosition.Bottom };
17+
ProgressButtonSpinSettings spinCenter = new ProgressButtonSpinSettings() { Position = SpinPosition.Center };
18+
19+
ViewBag.spinRight = spinRight;
20+
ViewBag.spinTop = spinTop;
21+
ViewBag.spinBottom = spinBottom;
22+
ViewBag.spinCenter = spinCenter;
23+
24+
ProgressButtonAnimationSettings slideLeft = new ProgressButtonAnimationSettings() { Effect = AnimationEffect.SlideLeft };
25+
ProgressButtonAnimationSettings slideRight = new ProgressButtonAnimationSettings() { Effect = AnimationEffect.SlideRight };
26+
ProgressButtonAnimationSettings zoomIn = new ProgressButtonAnimationSettings() { Effect = AnimationEffect.ZoomIn };
27+
ProgressButtonAnimationSettings zoomOut = new ProgressButtonAnimationSettings() { Effect = AnimationEffect.ZoomOut };
28+
29+
ViewBag.slideLeft = slideLeft;
30+
ViewBag.slideRight = slideRight;
31+
ViewBag.zoomIn = zoomIn;
32+
ViewBag.zoomOut = zoomOut;
4233
return View();
4334
}
4435
}

Controllers/Button/RadioButtonForController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public IActionResult RadioButtonFor(RadioButtonModel model)
2424

2525
public class RadioButtonModel
2626
{
27-
[Required]
27+
[RegularExpression("male", ErrorMessage = "Male gender is required.")]
2828
public string gender { get; set; }
2929
}
3030
}

Controllers/Button/SwitchForController.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Linq;
44
using System.Threading.Tasks;
55
using Microsoft.AspNetCore.Mvc;
6-
using EJ2CoreSampleBrowser.Models;
6+
using System.ComponentModel.DataAnnotations;
77

88
namespace EJ2CoreSampleBrowser.Controllers
99
{
@@ -21,4 +21,9 @@ public IActionResult SwitchFor(SwitchModel model)
2121
return View(model);
2222
}
2323
}
24+
public class SwitchModel
25+
{
26+
[Range(typeof(bool), "true", "true", ErrorMessage = "You need to agree to receive newsletter")]
27+
public bool check { get; set; }
28+
}
2429
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Threading.Tasks;
5+
using Microsoft.AspNetCore.Mvc;
6+
7+
8+
namespace EJ2CoreSampleBrowser.Controllers
9+
{
10+
public partial class CalendarController : Controller
11+
{
12+
// GET: /<controller>/
13+
public IActionResult IslamicCalendar()
14+
{
15+
return View();
16+
}
17+
}
18+
}

Controllers/Card/BasicCardController.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
using System.Threading.Tasks;
55
using Microsoft.AspNetCore.Mvc;
66

7-
// For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
8-
97
namespace EJ2CoreSampleBrowser.Controllers
108
{
119
public partial class CardController : Controller

0 commit comments

Comments
 (0)