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

Merge remote-tracking branch 'origin/6.2.0' into 7.0.1

Browse Source
This commit is contained in:
Shannon
2013-12-09 12:49:13 +11:00
parent 8469d18a0e 14790559cb
commit 6ec297aaaf
7 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Umbraco.Tests/PluginManagerTests.cs
View File

@@ -337,6 +337,29 @@ namespace Umbraco.Tests
Assert.AreEqual(3, types.Count());
}
/// <summary>
/// This demonstrates this issue: http://issues.umbraco.org/issue/U4-3505 - the TypeList was returning a list of assignable types
/// not explicit types which is sort of ideal but is confusing so we'll do it the less confusing way.
/// </summary>
[Test]
public void TypeList_Resolves_Explicit_Types()
{
var types = new HashSet<PluginManager.TypeList>();
var propEditors = new PluginManager.TypeList<PropertyEditor>(PluginManager.TypeResolutionKind.FindAllTypes);
propEditors.AddType(typeof (LabelPropertyEditor));
types.Add(propEditors);
var found = types.SingleOrDefault(x => x.IsTypeList<PropertyEditor>(PluginManager.TypeResolutionKind.FindAllTypes));
Assert.IsNotNull(found);
//This should not find a type list of this type
var shouldNotFind = types.SingleOrDefault(x => x.IsTypeList<IParameterEditor>(PluginManager.TypeResolutionKind.FindAllTypes));
Assert.IsNull(shouldNotFind);
}
/// <summary>
/// This demonstrates this issue: http://issues.umbraco.org/issue/U4-3505 - the TypeList was returning a list of assignable types
/// not explicit types which is sort of ideal but is confusing so we'll do it the less confusing way.

5
src/Umbraco.Web.UI/umbraco/Search/quickSearch.js
View File

@@ -56,7 +56,10 @@
return parsed;
},
formatItem: function (item) {
return item.Fields.nodeName + " <span class='nodeId'>(" + item.Id + ")</span>";
return item.Fields.nodeName + " <span class='nodeId'>(" + item.Id + ") </span>";
},
focus: function (event, ui) {
$(ui).attr("title", $(ui).find("span[title]").attr("title"));
}
};

2
src/Umbraco.Web.UI/umbraco/config/lang/da.xml
View File

@@ -450,7 +450,7 @@
<key alias="moveTo">Flyt til</key>
<key alias="nodeSelected">er blevet valgt som roden for dit nye indhold, klik 'ok' nedenunder.</key>
<key alias="noNodeSelected">Intet element valgt, vælg et element i listen ovenfor før der klikkes 'fortsæt'</key>
<key alias="notAllowedByContentType">Den nuværende node kan ikke ligges under denne pga. dens type</key>
<key alias="notAllowedByContentType">Den nuværende node kan ikke lægges under denne pga. sin type</key>
<key alias="notAllowedByPath">Den nuværende node kan ikke ligge under en af dens undersider</key>
<key alias="notValid">Denne handling er ikke tilladt fordi du ikke har de fornødne rettigheder på et eller flere af under-dokumenterne</key>
</area>

1
src/Umbraco.Web.UI/umbraco/xslt/searchResult.xslt
View File

@@ -18,6 +18,7 @@
</xsl:if>
<xsl:value-of select="@title"/>
</a>
<small><strong>Node Type: </strong> <xsl:value-of select="@type"/></small>
</h4>
<p>
<em>Last updated <xsl:value-of select="@author"/> on <xsl:value-of select="@changeDate"/>

32
src/Umbraco.Web.UI/umbraco_client/Application/JQuery/jquery.autocomplete.js
View File

@@ -1,13 +1,13 @@
/*
* jQuery Autocomplete plugin 1.1
*
* Copyright (c) 2009 Jörn Zaefferer
*
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl.html
*
* Revision: $Id: jquery.autocomplete.js 15 2009-08-22 10:30:27Z joern.zaefferer $
/*
* jQuery Autocomplete plugin 1.1
*
* Copyright (c) 2009 Jörn Zaefferer
*
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl.html
*
* Revision: $Id: jquery.autocomplete.js 15 2009-08-22 10:30:27Z joern.zaefferer $
*/
; (function($) {
@@ -429,7 +429,8 @@
return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + term.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi, "\\$1") + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "<strong>$1</strong>");
},
scroll: true,
scrollHeight: 180
scrollHeight: 180,
focus: function (event, ui) { }
};
$.Autocompleter.Cache = function(options) {
@@ -526,9 +527,9 @@
load: function(q) {
if (!options.cacheLength || !length)
return null;
/*
* if dealing w/local data and matchContains than we must make sure
* to loop through all the data collections looking for matches
/*
* if dealing w/local data and matchContains than we must make sure
* to loop through all the data collections looking for matches
*/
if (!options.url && options.matchContains) {
// track all matches
@@ -599,6 +600,7 @@
if (target(event).nodeName && target(event).nodeName.toUpperCase() == 'LI') {
active = $("li", list).removeClass(CLASSES.ACTIVE).index(target(event));
$(target(event)).addClass(CLASSES.ACTIVE);
options.focus(event, target(event));
}
}).click(function(event) {
$(target(event)).addClass(CLASSES.ACTIVE);
@@ -632,6 +634,8 @@
listItems.slice(active, active + 1).removeClass(CLASSES.ACTIVE);
movePosition(step);
var activeItem = listItems.slice(active, active + 1).addClass(CLASSES.ACTIVE);
options.focus(null, activeItem);
if (options.scroll) {
var offset = 0;
listItems.slice(0, active).each(function() {

4
src/Umbraco.Web.UI/umbraco_client/propertypane/style.css
View File

@@ -35,6 +35,10 @@
{
font-weight: normal;
color: #666;
font-size: .9em;
}
.propertypane small strong {
color: #000;
}
.propertypane div.propertyItem{

1
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs
View File

@@ -103,6 +103,7 @@ namespace umbraco.presentation.dialogs
x.Attributes.Append(XmlHelper.AddAttribute(result, "title", r.Fields["nodeName"]));
x.Attributes.Append(XmlHelper.AddAttribute(result, "author", r.Fields["writerName"]));
x.Attributes.Append(XmlHelper.AddAttribute(result, "changeDate", r.Fields["updateDate"]));
x.Attributes.Append(xmlHelper.addAttribute(result, "type", r.Fields["nodeTypeAlias"]));
result.DocumentElement.AppendChild(x);
}