Skip to content

config(EJ2-22710): 16.4.0.52 .source code #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Content/card/eiffeltower.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/card/iphone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/card/malaysia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/card/newyork.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Content/card/sydney.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Controllers/DatePicker/DateRangeController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public partial class DatePickerController : Controller
// GET: DefaultFunctionalities
public ActionResult DateRange()
{
ViewBag.value = DateTime.Now;
ViewBag.value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 10);
ViewBag.minDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 05);
ViewBag.maxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 27);
return View();
Expand Down
2 changes: 1 addition & 1 deletion Controllers/DateRangePicker/PresetsController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public ActionResult Presets()
ViewBag.weekEnd = ViewBag.weekStart.AddDays(6);
ViewBag.monthStart = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
ViewBag.monthEnd = ViewBag.monthStart.AddMonths(1).AddDays(-1);
ViewBag.lastMonthStart = new DateTime(DateTime.Now.Year, (DateTime.Now.Month - 1), 1);
ViewBag.lastMonthStart = new DateTime(lastMonth.Year, lastMonth.Month, 1);
ViewBag.lastMonthEnd = ViewBag.lastMonthStart.AddMonths(1).AddDays(-1);
ViewBag.lastYearStart = new DateTime(DateTime.Now.Year - 1, 1, 1);
ViewBag.lastYearEnd = new DateTime(DateTime.Now.Year - 1, 12, 31);
Expand Down
2 changes: 1 addition & 1 deletion Controllers/DateTimePicker/DateRangeController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public partial class DateTimePickerController : Controller
// GET: DefaultFunctionalities
public ActionResult DateRange()
{
ViewBag.value = DateTime.Now;
ViewBag.value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 09, 11, 00, 00);
ViewBag.minDate =new DateTime(DateTime.Now.Year, DateTime.Now.Month, 07, 10, 00, 00);
ViewBag.maxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 27, 22, 30, 00);
return View();
Expand Down
2 changes: 1 addition & 1 deletion Controllers/RichTextEditor/OverviewController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public ActionResult Overview()
<p>Provides an option to customize quick toolbar for an image </p>
</li>
</ol>
<img alt = 'Logo' src ="+ @Url.Content("/Content/images/RichTextEditor/RTEImage-Feather.png") + " style='width: 300px'/></div></div></div>";
<img alt = 'Logo' src ="+ @Url.Content("~/Content/images/RichTextEditor/RTEImage-Feather.png") + " style='width: 300px'/></div></div></div>";


ViewBag.tools = new[] { "Bold", "Italic", "Underline", "StrikeThrough",
Expand Down
2 changes: 1 addition & 1 deletion Controllers/RichTextEditor/TypesController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public ActionResult Types()

</ol>

<img alt = 'Logo' src = " + @Url.Content("/Content/images/RichTextEditor/RTEImage-Feather.png") +" />";
<img alt = 'Logo' src = " + @Url.Content("~/Content/images/RichTextEditor/RTEImage-Feather.png") +" />";
ViewBag.items = new[] {"Bold", "Italic", "Underline", "StrikeThrough",
"FontName", "FontSize", "FontColor", "BackgroundColor",
"LowerCase", "UpperCase", "|",
Expand Down
20 changes: 20 additions & 0 deletions Controllers/TreeGrid/CustomAggregateController.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Mvc;
using static EJ2MVCSampleBrowser.Models.TreeGridItems;

namespace EJ2MVCSampleBrowser.Controllers.TreeGrid
{
public partial class TreeGridController : Controller
{
// GET: CustomAggregate
public ActionResult CustomAggregate()
{
var treeData = ShipmentData.GetShipmentData();
ViewBag.datasource = treeData;
return View();
}
}
}
21 changes: 21 additions & 0 deletions Controllers/TreeGrid/CustomContextMenuController.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Mvc;
using EJ2MVCSampleBrowser.Models;

namespace EJ2MVCSampleBrowser.Controllers.TreeGrid
{
public partial class TreeGridController : Controller
{
// GET: CustomContextMenu
public ActionResult CustomContextMenu()
{
var treeData = TreeGridItems.GetTreeData();
ViewBag.datasource = treeData;
return View();
}

}
}
21 changes: 21 additions & 0 deletions Controllers/TreeGrid/EventsController.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Mvc;
using EJ2MVCSampleBrowser.Models;

namespace EJ2MVCSampleBrowser.Controllers.TreeGrid
{
public partial class TreeGridController : Controller
{
// GET: Events
public ActionResult Events()
{
var treeData = TreeGridItems.GetTreeData();
ViewBag.datasource = treeData;
return View();
}
}

}
5 changes: 5 additions & 0 deletions Controllers/TreeGrid/FilterMenuController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ public ActionResult FilterMenu()
new { id = "None", mode = "None" }
};
ViewBag.dropdata = dropData;
List<Object> typedropData = new List<object>() {
new { id = "Menu", type = "Menu" },
new { id = "Excel", type = "Excel" }
};
ViewBag.typedropdata = typedropData;
return View();
}
}
Expand Down
21 changes: 21 additions & 0 deletions Controllers/TreeGrid/KeyboardInteractionController.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Mvc;
using EJ2MVCSampleBrowser.Models;

namespace EJ2MVCSampleBrowser.Controllers.TreeGrid
{
public partial class TreeGridController : Controller
{
// GET: KeyboardsInteraction
public ActionResult KeyboardInteraction()
{
var treeData = TreeGridItems.GetTreeData();
ViewBag.datasource = treeData;
return View();
}
}

}
21 changes: 21 additions & 0 deletions Controllers/TreeGrid/ToolbarTemplateController.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Mvc;
using EJ2MVCSampleBrowser.Models;

namespace EJ2MVCSampleBrowser.Controllers.TreeGrid
{
public partial class TreeGridController : Controller
{
// GET: DefaultFunctionalities
public ActionResult ToolbarTemplate()
{
var treeData = TreeGridItems.GetTreeData();
ViewBag.datasource = treeData;
return View();
}
}

}
Loading