From 9843e2e15d104ff5917349e6edff921c3cc32d68 Mon Sep 17 00:00:00 2001
From: sebastiaan <unknown@kiln.example.com>
Date: Tue, 4 Sep 2012 12:04:06 -0200
Subject: [PATCH] Add razor highlighting for codemirror

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj                 | 3 +++
 src/Umbraco.Web/Umbraco.Web.csproj                       | 4 +++-
 src/umbraco.editorControls/umbraco.editorControls.csproj | 4 +---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index b63dfc484d..b085880746 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -450,6 +450,8 @@
     <Content Include="umbraco_client\CodeMirror\js\mode\python\index.html" />
     <Content Include="umbraco_client\CodeMirror\js\mode\python\LICENSE.txt" />
     <Content Include="umbraco_client\CodeMirror\js\mode\python\python.js" />
+    <Content Include="umbraco_client\CodeMirror\js\mode\razor\index.html" />
+    <Content Include="umbraco_client\CodeMirror\js\mode\razor\razor.js" />
     <Content Include="umbraco_client\CodeMirror\js\mode\rpm\changes\changes.js" />
     <Content Include="umbraco_client\CodeMirror\js\mode\rpm\changes\index.html" />
     <Content Include="umbraco_client\CodeMirror\js\mode\rpm\spec\index.html" />
@@ -1460,6 +1462,7 @@
     <None Include="umbraco_client\CodeMirror\js\mode\coffeescript\LICENSE" />
     <None Include="umbraco_client\CodeMirror\js\mode\pascal\LICENSE" />
     <None Include="umbraco_client\CodeMirror\js\mode\perl\LICENSE" />
+    <Content Include="umbraco_client\CodeMirror\js\mode\razor\LICENSE" />
     <None Include="umbraco_client\CodeMirror\js\mode\ruby\LICENSE" />
     <None Include="umbraco_client\CodeMirror\js\mode\r\LICENSE" />
     <None Include="umbraco_client\CodeMirror\js\mode\xquery\LICENSE" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 9730424676..e7158a3702 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1947,7 +1947,9 @@
     <Content Include="umbraco.presentation\umbraco\developer\Cache\viewCacheItem.aspx" />
     <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx" />
     <Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx" />
-    <Content Include="umbraco.presentation\umbraco\editContent.aspx" />
+    <Content Include="umbraco.presentation\umbraco\editContent.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
     <Content Include="umbraco.presentation\umbraco\editMedia.aspx" />
     <Content Include="umbraco.presentation\umbraco\js\language.aspx" />
     <Content Include="umbraco.presentation\umbraco\login.aspx">
diff --git a/src/umbraco.editorControls/umbraco.editorControls.csproj b/src/umbraco.editorControls/umbraco.editorControls.csproj
index 6248fc9ca9..07f449250e 100644
--- a/src/umbraco.editorControls/umbraco.editorControls.csproj
+++ b/src/umbraco.editorControls/umbraco.editorControls.csproj
@@ -235,9 +235,7 @@
     <Compile Include="folderbrowser\DataTypeFolderbrowser.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="folderbrowser\folderBrowser.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="folderbrowser\folderBrowser.cs" />
     <Compile Include="imagecropper\Config.cs" />
     <Compile Include="imagecropper\Data.cs" />
     <Compile Include="imagecropper\DataEditor.cs" />