Merge pull request #1 from cristipufu/master

fallback to area common
vtfuture · Oct 4, 2013 · afe4113 · afe4113
2 parents 4b3c525 + bd3d189
commit afe4113
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/RequireJsNet/RequireJsHtmlHelpers.cs b/RequireJsNet/RequireJsHtmlHelpers.cs
@@ -60,11 +60,16 @@ public static MvcHtmlString RequireJsEntryPoint(this HtmlHelper html)
                        : "Root";
             var controller = html.ViewContext.Controller.ValueProvider.GetValue("controller").RawValue as string;
             var action = html.ViewContext.Controller.ValueProvider.GetValue("action").RawValue as string;
-
-            var entryPoint = "Controllers/" + area + "/" + controller + "/" + controller + "-" + action;
+			var entryPointTmpl = "Controllers/{0}/" + controller + "/" + controller + "-" + action;
+            var entryPoint = string.Format(entryPointTmpl, area);
             var filePath = html.ViewContext.HttpContext.Server.MapPath("~/Scripts/" + entryPoint + ".js");
-
-            return File.Exists(filePath) ? new MvcHtmlString(entryPoint) : null;
+			if (File.Exists(filePath))
+            {
+                return new MvcHtmlString(entryPoint);
+            }
+            entryPoint = string.Format(entryPointTmpl, "Common");
+            var fallbackFile = html.ViewContext.HttpContext.Server.MapPath("~/Scripts/" + entryPoint + ".js");
+            return File.Exists(fallbackFile) ? new MvcHtmlString(entryPoint) : null;
         }
 
         public static MvcHtmlString GetRequireJsPaths(this HtmlHelper html)