yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing javascript error with tab view in media picker for tinyMCE

Browse Source 
fixing assembly versioning so that all umbraco assemblies have the same version
~AP

[TFS Changeset #70951]
This commit is contained in:
hartvig
2010-06-23 14:12:16 +00:00
parent 25e0fd1151
commit cfb088ee07
30 changed files with 74 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
LinqToUmbraco/src/umbraco.Linq/Solution Items/SolutionInfo.cs
View File

@@ -2,11 +2,11 @@ using System.Reflection;
using System.Resources;
[assembly: AssemblyCompany("umbraco")]
[assembly: AssemblyCopyright("Copyright © 2009")]
[assembly: AssemblyCopyright("Copyright © 2010")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguageAttribute("en-US")]
[assembly: AssemblyVersion("0.0.1.*")]
[assembly: AssemblyFileVersion("0.0.1.0")]
[assembly: AssemblyVersion("1.0.*")]

19
components/editorControls/AssemblyInfo.cs
View File

@@ -6,27 +6,10 @@ using System.Runtime.CompilerServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
//
[assembly: AssemblyTitle("")]
[assembly: AssemblyTitle("umbraco.editorControls")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
//
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.*")]
//
// In order to sign your assembly you must specify a key to use. Refer to the

3
components/editorControls/umbraco.editorControls.csproj
View File

@@ -160,6 +160,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\LinqToUmbraco\src\umbraco.Linq\Solution Items\SolutionInfo.cs">
<Link>SolutionInfo.cs</Link>
</Compile>
<Compile Include="AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>

19
components/macroRenderings/AssemblyInfo.cs
View File

@@ -6,27 +6,10 @@ using System.Runtime.CompilerServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
//
[assembly: AssemblyTitle("")]
[assembly: AssemblyTitle("umbraco.macroRenderings")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
//
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.*")]
//
// In order to sign your assembly you must specify a key to use. Refer to the

3
components/macroRenderings/umbraco.macroRenderings.csproj
View File

@@ -148,6 +148,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\LinqToUmbraco\src\umbraco.Linq\Solution Items\SolutionInfo.cs">
<Link>SolutionInfo.cs</Link>
</Compile>
<Compile Include="AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>

19
components/umbraco.controls/Properties/AssemblyInfo.cs
View File

@@ -8,11 +8,11 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("umbraco.controls")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("netMedia.dk ApS")]
//[assembly: AssemblyCompany("netMedia.dk ApS")]
[assembly: AssemblyProduct("umbraco.controls")]
[assembly: AssemblyCopyright("Copyright © netMedia.dk ApS 2008")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
//[assembly: AssemblyCopyright("Copyright © netMedia.dk ApS 2008")]
//[assembly: AssemblyTrademark("")]
//[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -22,14 +22,3 @@ using System.Runtime.InteropServices;
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("1292737a-7e2d-464a-9850-9380792f668e")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

3
components/umbraco.controls/umbraco.controls.csproj
View File

@@ -77,6 +77,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\LinqToUmbraco\src\umbraco.Linq\Solution Items\SolutionInfo.cs">
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
<Compile Include="DatePicker\DateTimePicker.cs" />
<Compile Include="ProgressBar.cs" />
<Compile Include="TreePicker\BaseTreePicker.cs" />

17
components/umbraco.webservices/Properties/AssemblyInfo.cs
View File

@@ -8,11 +8,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("umbraco.webservices")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("umbraco.webservices")]
[assembly: AssemblyCopyright("Copyright © 2008")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -21,16 +17,3 @@ using System.Runtime.InteropServices;
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("58e13174-1338-40a8-b864-f47c7678a976")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

3
components/umbraco.webservices/umbraco.webservices.csproj
View File

@@ -68,6 +68,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\LinqToUmbraco\src\umbraco.Linq\Solution Items\SolutionInfo.cs">
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
<Compile Include="BaseWebService.cs">
<SubType>Component</SubType>
</Compile>

18
umbraco.Test/Properties/AssemblyInfo.cs
View File

@@ -8,11 +8,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("umbraco.Test")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("umbraco.Test")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM componenets. If you need to access a type in this assembly from
@@ -20,16 +16,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("662e3518-c5af-49ea-a195-dee4b94a522d")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: Guid("662e3518-c5af-49ea-a195-dee4b94a522d")]

3
umbraco.Test/umbraco.Test.csproj
View File

@@ -137,6 +137,9 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\LinqToUmbraco\src\umbraco.Linq\Solution Items\SolutionInfo.cs">
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
<Compile Include="ApplicationTest.cs" />
<Compile Include="ApplicationTreeTest.cs" />
<Compile Include="DataTypeDefinitionTest.cs" />

19
umbraco/businesslogic/AssemblyInfo.cs
View File

@@ -6,27 +6,10 @@ using System.Runtime.CompilerServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
//
[assembly: AssemblyTitle("")]
[assembly: AssemblyTitle("umbraco.businesslogic")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
//
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.*")]
//
// In order to sign your assembly you must specify a key to use. Refer to the

3
umbraco/businesslogic/umbraco.businesslogic.csproj
View File

@@ -127,6 +127,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\LinqToUmbraco\src\umbraco.Linq\Solution Items\SolutionInfo.cs">
<Link>SolutionInfo.cs</Link>
</Compile>
<Compile Include="Application.cs">
<SubType>Code</SubType>
</Compile>

19
umbraco/cms/Properties/AssemblyInfo.cs
View File

@@ -6,27 +6,10 @@ using System.Runtime.CompilerServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
//
[assembly: AssemblyTitle("")]
[assembly: AssemblyTitle("umbraco.cms")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
//
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.*")]
//
// In order to sign your assembly you must specify a key to use. Refer to the

3
umbraco/cms/umbraco.cms.csproj
View File

@@ -148,6 +148,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\LinqToUmbraco\src\umbraco.Linq\Solution Items\SolutionInfo.cs">
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
<Compile Include="Actions\Action.cs">
<SubType>Code</SubType>
</Compile>

16
umbraco/datalayer/Properties/AssemblyInfo.cs
View File

@@ -16,11 +16,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("Umbraco Data Layer")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Umbraco Data Layer")]
[assembly: AssemblyCopyright("Copyright ©2008 Ruben Verborgh")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -29,15 +25,3 @@ using System.Runtime.InteropServices;
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("6210756f-436d-4536-bad3-d7b000e1694f")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("0.3.0.0")]
[assembly: AssemblyFileVersion("0.3.0.0")]

3
umbraco/datalayer/umbraco.datalayer.csproj
View File

@@ -86,6 +86,9 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\LinqToUmbraco\src\umbraco.Linq\Solution Items\SolutionInfo.cs">
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
<Compile Include="DataLayerHelper.cs" />
<Compile Include="Extensions\ISqlHelperExtension.cs" />
<Compile Include="Extensions\Logger.cs" />

19
umbraco/interfaces/AssemblyInfo.cs
View File

@@ -6,27 +6,10 @@ using System.Runtime.CompilerServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
//
[assembly: AssemblyTitle("")]
[assembly: AssemblyTitle("umbraco.interfaces")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
//
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.*")]
//
// In order to sign your assembly you must specify a key to use. Refer to the

3
umbraco/interfaces/umbraco.interfaces.csproj
View File

@@ -114,6 +114,9 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\LinqToUmbraco\src\umbraco.Linq\Solution Items\SolutionInfo.cs">
<Link>SolutionInfo.cs</Link>
</Compile>
<Compile Include="AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>

19
umbraco/presentation/AssemblyInfo.cs → umbraco/presentation/Properties/AssemblyInfo.cs
View File

@@ -6,27 +6,10 @@ using System.Runtime.CompilerServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
//
[assembly: AssemblyTitle("")]
[assembly: AssemblyTitle("umbraco.presentation")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
//
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.*")]
//
// In order to sign your assembly you must specify a key to use. Refer to the

4
umbraco/presentation/config/restExtensions.config
View File

@@ -10,4 +10,8 @@
<permission method="setProperty" allowAll="false" />
</ext>
-->
<ext assembly="Umlaut.Umb.Blog" type="Umlaut.Umb.Blog.Library.Base" alias="Blog4Umbraco">
<permission method="CreateComment" returnXml="false" allowAll="true" />
<permission method="GetGravatarImage" returnXml="false" allowAll="true" />
</ext>
</RestExtensions>

2
umbraco/presentation/config/umbracoSettings.config
View File

@@ -150,4 +150,4 @@
<!--<link application="content" applicationUrl="dashboard.aspx" language="en" userType="Administrators" helpUrl="http://www.xyz.no?{0}/{1}/{2}/{3}" /> -->
</help>
</settings>
</settings>

8
umbraco/presentation/config/xsltExtensions.config
View File

@@ -1,3 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<XsltExtensions>
</XsltExtensions>
<ext assembly="umbraco.editorControls" type="umbraco.editorControls.tags.library" alias="tagsLib">
</ext>
<ext assembly="Umlaut.Umb.Blog" type="Umlaut.Umb.Blog.BlogLibrary" alias="BlogLibrary">
</ext>
</XsltExtensions>

6
umbraco/presentation/umbraco.presentation.csproj
View File

@@ -212,7 +212,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs">
<Compile Include="..\..\LinqToUmbraco\src\umbraco.Linq\Solution Items\SolutionInfo.cs">
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="BasePageExtensions.cs" />
@@ -2845,7 +2848,6 @@
<DependentUpon>umbraco.xsd</DependentUpon>
</None>
<Content Include="config\UrlRewriting.config" />
<Content Include="web.config" />
</ItemGroup>
<ItemGroup>
<WebReferences Include="Web References\" />

20
umbraco/presentation/umbraco_client/tabview/javascript.js
View File

@@ -8,18 +8,18 @@ Umbraco.Controls.TabView = (function () {
var obj = {
setActiveTab: function (tabviewid, tabid, tabs) {
for (var i = 0; i < tabs.length; i++) {
$("#" + tabs[i]).attr("class", "tabOff");
$("#" + tabs[i] + "layer").hide();
jQuery("#" + tabs[i]).attr("class", "tabOff");
jQuery("#" + tabs[i] + "layer").hide();
}
var activeTab = $("#" + tabid).attr("class", "tabOn");
$("#" + tabid + "layer").show();
$("#" + tabviewid + '_activetab').val(tabid);
var activeTab = jQuery("#" + tabid).attr("class", "tabOn");
jQuery("#" + tabid + "layer").show();
jQuery("#" + tabviewid + '_activetab').val(tabid);
// show first tinymce toolbar
$(".tinymceMenuBar").hide();
$(document).ready(function () {
$("#" + tabid + "layer .tinymceMenuBar:first").show();
jQuery(".tinymceMenuBar").hide();
jQuery(document).ready(function () {
jQuery("#" + tabid + "layer .tinymceMenuBar:first").show();
});
for (var i = 0; i < onChangeEvents.length; i++) {
var fn = onChangeEvents[i];
@@ -75,7 +75,7 @@ Umbraco.Controls.TabView = (function () {
// Try to grab the next one!
if (nextTab != "00") {
if ($("#" + preFix + '_tab' + nextTab) != null) {
if (jQuery("#" + preFix + '_tab' + nextTab) != null) {
setActiveTab(preFix, preFix + '_tab' + nextTab, eval(preFix + '_tabs'));
}
}
@@ -83,7 +83,7 @@ Umbraco.Controls.TabView = (function () {
};
return obj;
})(jQuery);
})();
function setActiveTab(tabviewid, tabid, tabs) {
Umbraco.Controls.TabView.setActiveTab(tabviewid, tabid, tabs);

2
umbraco/presentation/web.config.UMBRACOELISE.xslt
View File

@@ -8,7 +8,7 @@
</xsl:template>
<xsl:template match="/configuration/appSettings/add[@key='umbracoConfigurationStatus']/@value">
<xsl:attribute name="value"></xsl:attribute>
<xsl:attribute name="value">4.1.0.RC</xsl:attribute>
</xsl:template>
<!-- Default templates to match anything else -->

18
umbraco/providers/Properties/AssemblyInfo.cs
View File

@@ -8,11 +8,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("umbraco.providers")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("umbraco.providers")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -20,16 +16,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("5b071553-1474-44a0-9cad-52b3f3255639")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: Guid("5b071553-1474-44a0-9cad-52b3f3255639")]

3
umbraco/providers/umbraco.providers.csproj
View File

@@ -69,6 +69,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\LinqToUmbraco\src\umbraco.Linq\Solution Items\SolutionInfo.cs">
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
<Compile Include="members\Helper.cs" />
<Compile Include="members\MembersMembershipProvider.cs" />
<Compile Include="members\MembersProfileProvider.cs" />

16
umbraco/umbraco.Legacy/Properties/AssemblyInfo.cs
View File

@@ -8,11 +8,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("umbraco.Legacy")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("umbraco.Legacy")]
[assembly: AssemblyCopyright("Copyright © 2009")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -21,15 +17,3 @@ using System.Runtime.InteropServices;
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("3d5900ae-111a-45be-96b3-d9e4606ca793")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

3
umbraco/umbraco.Legacy/umbraco.Legacy.csproj
View File

@@ -76,6 +76,9 @@
<Reference Include="System.Web.Mobile" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\LinqToUmbraco\src\umbraco.Linq\Solution Items\SolutionInfo.cs">
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
<Compile Include="controls\datePicker.cs" />
<Compile Include="controls\datePickerWithpopup.cs" />
<Compile Include="controls\dateTimePicker.cs" />