-
Notifications
You must be signed in to change notification settings - Fork 552
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #610 from sbwalker/master
refactoring of #518 to simplify registration of scripts in modules and themes
- Loading branch information
Showing
17 changed files
with
106 additions
and
207 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,64 +1,11 @@ | ||
| using Microsoft.AspNetCore.Components; | ||
| using Microsoft.JSInterop; | ||
| using Oqtane.Shared; | ||
| using Oqtane.Models; | ||
| using Oqtane.UI; | ||
|
|
||
| namespace Oqtane.Themes | ||
| { | ||
| public abstract class ContainerBase : ComponentBase, IContainerControl | ||
| public abstract class ContainerBase : ThemeBase, IContainerControl | ||
| { | ||
| [Inject] | ||
| protected IJSRuntime JSRuntime { get; set; } | ||
|
|
||
| [CascadingParameter] | ||
| protected PageState PageState { get; set; } | ||
|
|
||
| [CascadingParameter] | ||
| protected Module ModuleState { get; set; } | ||
|
|
||
| public virtual string Name { get; set; } | ||
| public virtual string Thumbnail { get; set; } | ||
|
|
||
| public string ThemePath() | ||
| { | ||
| return "Themes/" + GetType().Namespace + "/"; | ||
| } | ||
|
|
||
| public string NavigateUrl() | ||
| { | ||
| return NavigateUrl(PageState.Page.Path); | ||
| } | ||
|
|
||
| public string NavigateUrl(string path) | ||
| { | ||
| return NavigateUrl(path, ""); | ||
| } | ||
|
|
||
| public string NavigateUrl(string path, string parameters) | ||
| { | ||
| return Utilities.NavigateUrl(PageState.Alias.Path, path, parameters); | ||
| } | ||
|
|
||
| public string EditUrl(string action, string parameters) | ||
| { | ||
| return EditUrl(ModuleState.ModuleId, action, parameters); | ||
| } | ||
|
|
||
| public string EditUrl(int moduleid, string action) | ||
| { | ||
| return EditUrl(moduleid, action, ""); | ||
| } | ||
|
|
||
| public string EditUrl(int moduleid, string action, string parameters) | ||
| { | ||
| return EditUrl(PageState.Page.Path, moduleid, action, parameters); | ||
| } | ||
|
|
||
| public string EditUrl(string path, int moduleid, string action, string parameters) | ||
| { | ||
| return Utilities.EditUrl(PageState.Alias.Path, path, moduleid, action, parameters); | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,7 @@ | ||
| using Microsoft.AspNetCore.Components; | ||
| using Oqtane.Shared; | ||
| using Oqtane.UI; | ||
|
|
||
| namespace Oqtane.Themes | ||
| namespace Oqtane.Themes | ||
| { | ||
| public abstract class LayoutBase : ComponentBase, ILayoutControl | ||
| public abstract class LayoutBase : ThemeBase, ILayoutControl | ||
| { | ||
| [CascadingParameter] | ||
| protected PageState PageState { get; set; } | ||
| public virtual string Name { get; set; } | ||
| public virtual string Thumbnail { get; set; } | ||
| public virtual string Panes { get; set; } | ||
|
|
||
| public string LayoutPath() | ||
| { | ||
| return "Themes/" + GetType().Namespace + "/"; | ||
| } | ||
|
|
||
| } | ||
| } |
Oops, something went wrong.