DeterminePackUriFromType only replaces assembly name when at start of…

… view name. Resolves #124
Caliburn-Micro · Mar 10, 2015 · bcfb6a2 · bcfb6a2
1 parent aee507b
commit bcfb6a2
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/Caliburn.Micro.Platform/ViewLocator.cs b/src/Caliburn.Micro.Platform/ViewLocator.cs
@@ -406,23 +406,23 @@ public static void AddSubNamespaceMapping(string nsSource, string nsTarget, stri
         public static Func<Type, Type, string> DeterminePackUriFromType = (viewModelType, viewType) => {
 #if !WinRT
             var assemblyName = viewType.Assembly.GetAssemblyName();
-            var uri = viewType.FullName.Replace(assemblyName, string.Empty).Replace(".", "/") + ".xaml";
-
-            if(!Application.Current.GetType().Assembly.GetAssemblyName().Equals(assemblyName)) {
-                return "/" + assemblyName + ";component" + uri;
-            }
-
-            return uri;
+            var applicationAssemblyName = Application.Current.GetType().Assembly.GetAssemblyName();
 #else
             var assemblyName = viewType.GetTypeInfo().Assembly.GetAssemblyName();
-            var uri = viewType.FullName.Replace(assemblyName, string.Empty).Replace(".", "/") + ".xaml";
+            var applicationAssemblyName = Application.Current.GetType().GetTypeInfo().Assembly.GetAssemblyName();
+#endif
+            var viewTypeName = viewType.FullName;
+
+            if (viewTypeName.StartsWith(assemblyName))
+                viewTypeName = viewTypeName.Substring(assemblyName.Length);
 
-            if (!Application.Current.GetType().GetTypeInfo().Assembly.GetAssemblyName().Equals(assemblyName)) {
+            var uri = viewTypeName.Replace(".", "/") + ".xaml";
+
+            if(!applicationAssemblyName.Equals(assemblyName)) {
                 return "/" + assemblyName + ";component" + uri;
             }
 
             return uri;
-#endif
         };
 
         /// <summary>