From 436e2931a8e42502c08eb5ee7e4eac3d5f652068 Mon Sep 17 00:00:00 2001 From: Greg Edwards Date: Fri, 23 Jan 2015 17:30:26 -0500 Subject: [PATCH] RequireScript/Css have default keys now. --- gts/src/RequireCss.cs | 14 ++++++++++++++ gts/src/RequireLinkBase.cs | 2 +- gts/src/RequireScript.cs | 14 ++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/gts/src/RequireCss.cs b/gts/src/RequireCss.cs index 81e81a1b..b6642f7d 100644 --- a/gts/src/RequireCss.cs +++ b/gts/src/RequireCss.cs @@ -22,5 +22,19 @@ namespace PkmnFoundations.Web } public String CssUrl { get; set; } + + public override string Key + { + get + { + if (base.Key != null) + return base.Key; + return CssUrl; + } + set + { + base.Key = value; + } + } } } \ No newline at end of file diff --git a/gts/src/RequireLinkBase.cs b/gts/src/RequireLinkBase.cs index 79bc5f94..529cc8a5 100644 --- a/gts/src/RequireLinkBase.cs +++ b/gts/src/RequireLinkBase.cs @@ -47,7 +47,7 @@ namespace PkmnFoundations.Web } } - public String Key { get; set; } + public virtual String Key { get; set; } public String After { get; set; } public abstract void RenderHeader(System.Web.UI.HtmlTextWriter writer); diff --git a/gts/src/RequireScript.cs b/gts/src/RequireScript.cs index d2bb7e1b..ff32efac 100644 --- a/gts/src/RequireScript.cs +++ b/gts/src/RequireScript.cs @@ -22,5 +22,19 @@ namespace PkmnFoundations.Web public String ScriptUrl { get; set; } public String Type { get; set; } + + public override string Key + { + get + { + if (base.Key != null) + return base.Key; + return ScriptUrl; + } + set + { + base.Key = value; + } + } } } \ No newline at end of file