Skip to content

Commit 742332e

Browse files
authored
Merge pull request #3 from vairamuthuR/master
Volume 4, 2018 SP1 (v16.4.52) released
2 parents fc73c92 + 8517bf1 commit 742332e

File tree

166 files changed

+1497
-497
lines changed

Some content is hidden

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

166 files changed

+1497
-497
lines changed

Diff for: Content/card/eiffeltower.png

-80.3 KB
Loading

Diff for: Content/card/iphone.png

-161 KB
Loading

Diff for: Content/card/malaysia.png

-105 KB
Loading

Diff for: Content/card/newyork.png

-83.6 KB
Loading

Diff for: Content/card/sydney.png

-94.4 KB
Loading

Diff for: Controllers/DatePicker/DateRangeController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public partial class DatePickerController : Controller
1212
// GET: DefaultFunctionalities
1313
public ActionResult DateRange()
1414
{
15-
ViewBag.value = DateTime.Now;
15+
ViewBag.value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 10);
1616
ViewBag.minDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 05);
1717
ViewBag.maxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 27);
1818
return View();

Diff for: Controllers/DateRangePicker/PresetsController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public ActionResult Presets()
1717
ViewBag.weekEnd = ViewBag.weekStart.AddDays(6);
1818
ViewBag.monthStart = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
1919
ViewBag.monthEnd = ViewBag.monthStart.AddMonths(1).AddDays(-1);
20-
ViewBag.lastMonthStart = new DateTime(DateTime.Now.Year, (DateTime.Now.Month - 1), 1);
20+
ViewBag.lastMonthStart = new DateTime(lastMonth.Year, lastMonth.Month, 1);
2121
ViewBag.lastMonthEnd = ViewBag.lastMonthStart.AddMonths(1).AddDays(-1);
2222
ViewBag.lastYearStart = new DateTime(DateTime.Now.Year - 1, 1, 1);
2323
ViewBag.lastYearEnd = new DateTime(DateTime.Now.Year - 1, 12, 31);

Diff for: Controllers/DateTimePicker/DateRangeController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public partial class DateTimePickerController : Controller
1212
// GET: DefaultFunctionalities
1313
public ActionResult DateRange()
1414
{
15-
ViewBag.value = DateTime.Now;
15+
ViewBag.value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 09, 11, 00, 00);
1616
ViewBag.minDate =new DateTime(DateTime.Now.Year, DateTime.Now.Month, 07, 10, 00, 00);
1717
ViewBag.maxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 27, 22, 30, 00);
1818
return View();

Diff for: Controllers/RichTextEditor/OverviewController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public ActionResult Overview()
4545
<p>Provides an option to customize quick toolbar for an image </p>
4646
</li>
4747
</ol>
48-
<img alt = 'Logo' src ="+ @Url.Content("/Content/images/RichTextEditor/RTEImage-Feather.png") + " style='width: 300px'/></div></div></div>";
48+
<img alt = 'Logo' src ="+ @Url.Content("~/Content/images/RichTextEditor/RTEImage-Feather.png") + " style='width: 300px'/></div></div></div>";
4949

5050

5151
ViewBag.tools = new[] { "Bold", "Italic", "Underline", "StrikeThrough",

Diff for: Controllers/RichTextEditor/TypesController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public ActionResult Types()
6666
6767
</ol>
6868
69-
<img alt = 'Logo' src = " + @Url.Content("/Content/images/RichTextEditor/RTEImage-Feather.png") +" />";
69+
<img alt = 'Logo' src = " + @Url.Content("~/Content/images/RichTextEditor/RTEImage-Feather.png") +" />";
7070
ViewBag.items = new[] {"Bold", "Italic", "Underline", "StrikeThrough",
7171
"FontName", "FontSize", "FontColor", "BackgroundColor",
7272
"LowerCase", "UpperCase", "|",

Diff for: Controllers/TreeGrid/CustomAggregateController.cs

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Web;
5+
using System.Web.Mvc;
6+
using static EJ2MVCSampleBrowser.Models.TreeGridItems;
7+
8+
namespace EJ2MVCSampleBrowser.Controllers.TreeGrid
9+
{
10+
public partial class TreeGridController : Controller
11+
{
12+
// GET: CustomAggregate
13+
public ActionResult CustomAggregate()
14+
{
15+
var treeData = ShipmentData.GetShipmentData();
16+
ViewBag.datasource = treeData;
17+
return View();
18+
}
19+
}
20+
}

Diff for: Controllers/TreeGrid/CustomContextMenuController.cs

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Web;
5+
using System.Web.Mvc;
6+
using EJ2MVCSampleBrowser.Models;
7+
8+
namespace EJ2MVCSampleBrowser.Controllers.TreeGrid
9+
{
10+
public partial class TreeGridController : Controller
11+
{
12+
// GET: CustomContextMenu
13+
public ActionResult CustomContextMenu()
14+
{
15+
var treeData = TreeGridItems.GetTreeData();
16+
ViewBag.datasource = treeData;
17+
return View();
18+
}
19+
20+
}
21+
}

Diff for: Controllers/TreeGrid/EventsController.cs

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Web;
5+
using System.Web.Mvc;
6+
using EJ2MVCSampleBrowser.Models;
7+
8+
namespace EJ2MVCSampleBrowser.Controllers.TreeGrid
9+
{
10+
public partial class TreeGridController : Controller
11+
{
12+
// GET: Events
13+
public ActionResult Events()
14+
{
15+
var treeData = TreeGridItems.GetTreeData();
16+
ViewBag.datasource = treeData;
17+
return View();
18+
}
19+
}
20+
21+
}

Diff for: Controllers/TreeGrid/FilterMenuController.cs

+5
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ public ActionResult FilterMenu()
2121
new { id = "None", mode = "None" }
2222
};
2323
ViewBag.dropdata = dropData;
24+
List<Object> typedropData = new List<object>() {
25+
new { id = "Menu", type = "Menu" },
26+
new { id = "Excel", type = "Excel" }
27+
};
28+
ViewBag.typedropdata = typedropData;
2429
return View();
2530
}
2631
}
+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Web;
5+
using System.Web.Mvc;
6+
using EJ2MVCSampleBrowser.Models;
7+
8+
namespace EJ2MVCSampleBrowser.Controllers.TreeGrid
9+
{
10+
public partial class TreeGridController : Controller
11+
{
12+
// GET: KeyboardsInteraction
13+
public ActionResult KeyboardInteraction()
14+
{
15+
var treeData = TreeGridItems.GetTreeData();
16+
ViewBag.datasource = treeData;
17+
return View();
18+
}
19+
}
20+
21+
}

Diff for: Controllers/TreeGrid/ToolbarTemplateController.cs

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Web;
5+
using System.Web.Mvc;
6+
using EJ2MVCSampleBrowser.Models;
7+
8+
namespace EJ2MVCSampleBrowser.Controllers.TreeGrid
9+
{
10+
public partial class TreeGridController : Controller
11+
{
12+
// GET: DefaultFunctionalities
13+
public ActionResult ToolbarTemplate()
14+
{
15+
var treeData = TreeGridItems.GetTreeData();
16+
ViewBag.datasource = treeData;
17+
return View();
18+
}
19+
}
20+
21+
}

0 commit comments

Comments
 (0)