lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '1.8.x' into 1.x

Browse Source 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
This commit is contained in:
Sebastien Ros
2014-08-15 13:52:08 -07:00
parent 8787b7cd5c 9550146acc
commit c816d8e24f
19 changed files with 107 additions and 1644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/aspnetwebapi/System.Net.Http.dll
View File

Binary file not shown.

1581
lib/aspnetwebapi/System.Net.Http.xml
View File

File diff suppressed because it is too large Load Diff

13
src/Orchard.Tests.Modules/Indexing/LuceneSearchBuilderTests.cs
View File

@@ -493,12 +493,12 @@ namespace Orchard.Tests.Modules.Indexing {
_provider.Store("default", _provider.New(3).Add("media-path", "images/pets/kitties").Store());
// Assert.That(SearchBuilder.WithField("media-path", "Pets").Mandatory().Count(), Is.EqualTo(0));
Assert.That(SearchBuilder.WithField("media-path", "Images").Mandatory().Count(), Is.EqualTo(3));
Assert.That(SearchBuilder.WithField("media-path", "Images").ExactMatch().Mandatory().Count(), Is.EqualTo(1));
Assert.That(SearchBuilder.WithField("media-path", "Images/Pets").Mandatory().Count(), Is.EqualTo(2));
Assert.That(SearchBuilder.WithField("media-path", "Images/Pets").ExactMatch().Mandatory().Count(), Is.EqualTo(0));
Assert.That(SearchBuilder.WithField("media-path", "Images/Pets/Puppies").ExactMatch().Mandatory().Count(), Is.EqualTo(1));
Assert.That(SearchBuilder.WithField("media-path", "Images/Pets/Puppies").Mandatory().Count(), Is.EqualTo(1));
Assert.That(SearchBuilder.WithField("media-path", "images").NotAnalyzed().Mandatory().Count(), Is.EqualTo(3));
Assert.That(SearchBuilder.WithField("media-path", "images").NotAnalyzed().ExactMatch().Mandatory().Count(), Is.EqualTo(1));
Assert.That(SearchBuilder.WithField("media-path", "images/pets").NotAnalyzed().Mandatory().Count(), Is.EqualTo(2));
Assert.That(SearchBuilder.WithField("media-path", "images/pets").NotAnalyzed().ExactMatch().Mandatory().Count(), Is.EqualTo(0));
Assert.That(SearchBuilder.WithField("media-path", "images/pets/puppies").NotAnalyzed().ExactMatch().Mandatory().Count(), Is.EqualTo(1));
Assert.That(SearchBuilder.WithField("media-path", "images/pets/puppies").NotAnalyzed().Mandatory().Count(), Is.EqualTo(1));
}
[Test]
@@ -543,6 +543,7 @@ namespace Orchard.Tests.Modules.Indexing {
// trying in full word match mode
Assert.That(SearchBuilder.WithField("tag-value", "tag1").ExactMatch().Count(), Is.EqualTo(1));
Assert.That(SearchBuilder.WithField("tag-value", "Tag1").ExactMatch().Count(), Is.EqualTo(1));
Assert.That(SearchBuilder.WithField("tag-value", "Tag1").NotAnalyzed().ExactMatch().Count(), Is.EqualTo(0));
}
[Test]

55
src/Orchard.Web/Modules/Lucene/Services/LuceneSearchBuilder.cs
View File

@@ -12,6 +12,7 @@ using Orchard.Indexing;
using Orchard.Logging;
using Lucene.Net.Documents;
using Lucene.Net.QueryParsers;
using Lucene.Net.Analysis.Tokenattributes;
namespace Lucene.Services {
public class LuceneSearchBuilder : ISearchBuilder {
@@ -34,6 +35,7 @@ namespace Lucene.Services {
// pending clause attributes
private Occur _occur;
private bool _exactMatch;
private bool _notAnalyzed;
private float _boost;
private Query _query;
@@ -127,7 +129,7 @@ namespace Lucene.Services {
public ISearchBuilder WithinRange(string field, string min, string max, bool includeMin = true, bool includeMax = true) {
CreatePendingClause();
_query = new TermRangeQuery(field, min != null ? QueryParser.Escape(min.ToLower()) : null, max != null ? QueryParser.Escape(max.ToLower()) : null, includeMin, includeMax);
_query = new TermRangeQuery(field, min != null ? QueryParser.Escape(min) : null, max != null ? QueryParser.Escape(max) : null, includeMin, includeMax);
return this;
}
@@ -135,7 +137,7 @@ namespace Lucene.Services {
CreatePendingClause();
if (!String.IsNullOrWhiteSpace(value)) {
_query = new TermQuery(new Term(field, QueryParser.Escape(value.ToLower())));
_query = new TermQuery(new Term(field, QueryParser.Escape(value)));
}
return this;
@@ -156,6 +158,11 @@ namespace Lucene.Services {
return this;
}
public ISearchBuilder NotAnalyzed() {
_notAnalyzed = true;
return this;
}
public ISearchBuilder Weighted(float weight) {
_boost = weight;
return this;
@@ -164,6 +171,7 @@ namespace Lucene.Services {
private void InitPendingClause() {
_occur = Occur.SHOULD;
_exactMatch = false;
_notAnalyzed = false;
_query = null;
_boost = 0;
_asFilter = false;
@@ -180,14 +188,32 @@ namespace Lucene.Services {
_query.Boost = _boost;
}
if (!_notAnalyzed) {
var termQuery = _query as TermQuery;
if (termQuery != null) {
var term = termQuery.Term;
var analyzedText = AnalyzeText(_analyzer, term.Field, term.Text).FirstOrDefault();
_query = new TermQuery(new Term(term.Field, analyzedText));
}
var termRangeQuery = _query as TermRangeQuery;
if (termRangeQuery != null) {
var lowerTerm = AnalyzeText(_analyzer, termRangeQuery.Field, termRangeQuery.LowerTerm).FirstOrDefault();
var upperTerm = AnalyzeText(_analyzer, termRangeQuery.Field, termRangeQuery.UpperTerm).FirstOrDefault();
_query = new TermRangeQuery(termRangeQuery.Field, lowerTerm, upperTerm, termRangeQuery.IncludesLower, termRangeQuery.IncludesUpper);
}
}
if (!_exactMatch) {
var termQuery = _query as TermQuery;
if (termQuery != null) {
var term = termQuery.Term;
// prefixed queries are case sensitive
_query = new PrefixQuery(term);
_query = new PrefixQuery(new Term(term.Field, term.Text));
}
}
if (_asFilter) {
_filters.Add(new BooleanClause(_query, _occur));
}
@@ -198,6 +224,27 @@ namespace Lucene.Services {
InitPendingClause();
}
private static List<string> AnalyzeText(Analyzer analyzer, string field, string text) {
if (String.IsNullOrEmpty(text)) {
return new List<string>();
}
var result = new List<string>();
using (var sr = new System.IO.StringReader(text)) {
using (TokenStream stream = analyzer.TokenStream(field, sr)) {
while (stream.IncrementToken()) {
var termAttribute = stream.GetAttribute<ITermAttribute>();
if(termAttribute != null) {
result.Add(termAttribute.Term);
}
}
}
}
return result;
}
public ISearchBuilder SortBy(string name) {
_sort = name;
_comparer = 0;

57
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
View File

@@ -25,6 +25,7 @@
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<TypeScriptToolsVersion>1.0</TypeScriptToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -184,15 +185,15 @@
<Content Include="Scripts\lib\dash.all.js" />
<Content Include="Scripts\lib\dash.min.js" />
<Content Include="Scripts\lib\jquery.blockui.js" />
<None Include="Scripts\cloudmedia-admin-job.ts" />
<None Include="Scripts\cloudmedia-admin-common.ts" />
<None Include="Scripts\cloudmedia-autorefresh.ts" />
<None Include="Scripts\cloudmedia-edit-asset-video.ts" />
<None Include="Scripts\cloudmedia-edit-asset.ts" />
<None Include="Scripts\cloudmedia-edit-cloudvideopart-direct.ts" />
<None Include="Scripts\cloudmedia-edit-cloudvideopart.ts" />
<None Include="Scripts\cloudmedia-edit-cloudvideopart-proxied.ts" />
<None Include="Scripts\cloudmedia-metadata-cloudvideopart.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-admin-job.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-admin-common.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-autorefresh.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-edit-asset-video.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-edit-asset.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-edit-cloudvideopart-direct.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-edit-cloudvideopart.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-edit-cloudvideopart-proxied.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-metadata-cloudvideopart.ts" />
<Content Include="Scripts\lib\jquery.fileupload-process.js" />
<Content Include="Scripts\lib\jquery.fileupload-validate.js" />
<Content Include="Scripts\lib\jquery.fileupload.js" />
@@ -283,16 +284,16 @@
<Content Include="Styles\Web.config" />
<Content Include="Properties\AssemblyInfo.cs" />
<Content Include="Module.txt" />
<Content Include="Scripts\cloudmedia-videoplayer-data.ts" />
<Content Include="Scripts\cloudmedia-videoplayer-injectors-dash.ts" />
<Content Include="Scripts\cloudmedia-videoplayer-injectors-html5.ts" />
<Content Include="Scripts\cloudmedia-videoplayer-injectors-alt.ts" />
<Content Include="Scripts\cloudmedia-videoplayer-injectors-smp.ts" />
<Content Include="Scripts\cloudmedia-videoplayer-injectors.ts" />
<Content Include="Scripts\cloudmedia-videoplayer-main.ts" />
<None Include="Scripts\typings\moment.d.ts" />
<None Include="Scripts\typings\underscore.d.ts" />
<None Include="Scripts\typings\uri.d.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-videoplayer-data.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-videoplayer-injectors-dash.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-videoplayer-injectors-html5.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-videoplayer-injectors-alt.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-videoplayer-injectors-smp.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-videoplayer-injectors.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-videoplayer-main.ts" />
<TypeScriptCompile Include="Scripts\typings\moment.d.ts" />
<TypeScriptCompile Include="Scripts\typings\underscore.d.ts" />
<TypeScriptCompile Include="Scripts\typings\uri.d.ts" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
@@ -446,10 +447,10 @@
<Content Include="Views\Parts\CloudVideo.SummaryAdmin.cshtml" />
</ItemGroup>
<ItemGroup>
<None Include="Scripts\typings\jquery.d.ts" />
<None Include="Scripts\typings\jqueryui.d.ts" />
<None Include="Scripts\typings\knockout.d.ts" />
<Content Include="Scripts\cloudmedia-admin-settings.ts" />
<TypeScriptCompile Include="Scripts\typings\jquery.d.ts" />
<TypeScriptCompile Include="Scripts\typings\jqueryui.d.ts" />
<TypeScriptCompile Include="Scripts\typings\knockout.d.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-admin-settings.ts" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\CloudVideo.Edit.Assets.cshtml" />
@@ -577,16 +578,6 @@
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<TypeScriptTarget>ES5</TypeScriptTarget>
<TypeScriptIncludeComments>true</TypeScriptIncludeComments>
<TypeScriptSourceMap>True</TypeScriptSourceMap>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<TypeScriptTarget>ES5</TypeScriptTarget>
<TypeScriptIncludeComments>false</TypeScriptIncludeComments>
<TypeScriptSourceMap>false</TypeScriptSourceMap>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets')" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />

4
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-edit-cloudvideopart.js
View File

@@ -13,9 +13,9 @@ var Orchard;
var corsSupported = hasCorsSupport();
if (corsSupported) {
Orchard.Azure.MediaServices.CloudVideoEdit.initializeUploadDirect();
CloudVideoEdit.initializeUploadDirect();
} else {
Orchard.Azure.MediaServices.CloudVideoEdit.initializeUploadProxied();
CloudVideoEdit.initializeUploadProxied();
}
var localStorage = window["localStorage"];

2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-edit-cloudvideopart.js.map
View File

@@ -1 +1 @@
{"version":3,"file":"cloudmedia-edit-cloudvideopart.js","sourceRoot":"","sources":["cloudmedia-edit-cloudvideopart.ts"],"names":["Orchard","Orchard.Azure","Orchard.Azure.MediaServices","Orchard.Azure.MediaServices.CloudVideoEdit","Orchard.Azure.MediaServices.CloudVideoEdit.hasCorsSupport"],"mappings":"AAAA,4CAA4C;AAC5C,8CAA8C;AAE9C,IAAO,OAAO;AAwBb,CAxBD,UAAO,OAAO;KAAdA,UAAeA,KAAKA;SAApBC,UAAqBA,aAAaA;aAAlCC,UAAmCA,cAAcA;gBAC7CC,SAASA,cAAcA;oBACnBC,OAAOA,iBAAiBA,IAAIA,IAAIA,cAAcA,CAACA,CAACA;gBACpDA,CAACA;;gBAEDD,CAACA,CAACA;oBACEA,IAAIA,aAAaA,GAAGA,cAAcA,CAACA,CAACA;;oBAEpCA,IAAIA,aAAaA,CAAEA;wBACfA,iEAAsBA,CAACA,CAACA;qBAC3BA,KAAMA;wBACHA,kEAAuBA,CAACA,CAACA;qBAC5BA;;oBAEDA,IAAIA,YAAYA,GAAGA,MAAMA,CAACA,cAAcA,CAACA;oBACzCA,IAAIA,UAAUA,GAAYA,CAACA,CAACA,OAAOA,CAACA,CAACA,IAAIA,CAACA,uBAAuBA,CAACA;oBAClEA,CAACA,CAACA,OAAOA,CAACA,CAACA,IAAIA,CAACA;wBACZA,QAAQA,EAAEA;4BACNA,IAAIA,YAAYA,IAAIA,YAAYA,CAACA,OAAOA;gCACpCA,YAAYA,CAACA,OAAOA,CAACA,uBAAuBA,EAAEA,CAACA,CAACA,OAAOA,CAACA,CAACA,IAAIA,CAACA,QAAQA,EAAEA,QAAQA,CAACA,CAACA,CAACA;wBAC3FA,CAACA;wBACDA,MAAMA,EAAEA,CAACA,UAAUA,IAAIA,YAAYA,IAAIA,YAAYA,CAACA,OAAOA,GAAGA,YAAYA,CAACA,OAAOA,CAACA,uBAAuBA,CAACA,GAAGA,IAAIA;qBACrHA,CAACA,CAACA,IAAIA,CAACA,CAACA;gBACbA,CAACA,CAACA;YACNA,CAACA,uEAAAD;8DAAAA;QAADA,CAACA,qDAAAD;gDAAAA;IAADA,CAACA,yCAAAD;8BAAAA;AAADA,CAACA,6BAAA"}
{"version":3,"file":"cloudmedia-edit-cloudvideopart.js","sourceRoot":"","sources":["cloudmedia-edit-cloudvideopart.ts"],"names":["Orchard","Orchard.Azure","Orchard.Azure.MediaServices","Orchard.Azure.MediaServices.CloudVideoEdit","Orchard.Azure.MediaServices.CloudVideoEdit.hasCorsSupport"],"mappings":"AAAA,4CAA4C;AAC5C,8CAA8C;AAE9C,IAAO,OAAO;AAwBb,CAxBD,UAAO,OAAO;KAAdA,UAAeA,KAAKA;SAApBC,UAAqBA,aAAaA;aAAlCC,UAAmCA,cAAcA;gBAC7CC,SAASA,cAAcA;oBACnBC,OAAOA,iBAAiBA,IAAIA,IAAIA,cAAcA,CAACA,CAACA;gBACpDA,CAACA;;gBAEDD,CAACA,CAACA;oBACEA,IAAIA,aAAaA,GAAGA,cAAcA,CAACA,CAACA;;oBAEpCA,IAAIA,aAAaA,CAAEA;wBACfA,qCAAsBA,CAACA,CAACA;qBAC3BA,KAAMA;wBACHA,sCAAuBA,CAACA,CAACA;qBAC5BA;;oBAEDA,IAAIA,YAAYA,GAAGA,MAAMA,CAACA,cAAcA,CAACA;oBACzCA,IAAIA,UAAUA,GAAYA,CAACA,CAACA,OAAOA,CAACA,CAACA,IAAIA,CAACA,uBAAuBA,CAACA;oBAClEA,CAACA,CAACA,OAAOA,CAACA,CAACA,IAAIA,CAACA;wBACZA,QAAQA,EAAEA;4BACNA,IAAIA,YAAYA,IAAIA,YAAYA,CAACA,OAAOA;gCACpCA,YAAYA,CAACA,OAAOA,CAACA,uBAAuBA,EAAEA,CAACA,CAACA,OAAOA,CAACA,CAACA,IAAIA,CAACA,QAAQA,EAAEA,QAAQA,CAACA,CAACA,CAACA;wBAC3FA,CAACA;wBACDA,MAAMA,EAAEA,CAACA,UAAUA,IAAIA,YAAYA,IAAIA,YAAYA,CAACA,OAAOA,GAAGA,YAAYA,CAACA,OAAOA,CAACA,uBAAuBA,CAACA,GAAGA,IAAIA;qBACrHA,CAACA,CAACA,IAAIA,CAACA,CAACA;gBACbA,CAACA,CAACA;YACNA,CAACA,uEAAAD;8DAAAA;QAADA,CAACA,qDAAAD;gDAAAA;IAADA,CAACA,yCAAAD;8BAAAA;AAADA,CAACA,6BAAA"}

2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-alt.js
View File

@@ -49,7 +49,7 @@ var Orchard;
_super.prototype.debug.call(this, "AltInjector: " + message, args);
};
return AltInjector;
})(Orchard.Azure.MediaServices.VideoPlayer.Injectors.Injector);
})(Injectors.Injector);
Injectors.AltInjector = AltInjector;
})(VideoPlayer.Injectors || (VideoPlayer.Injectors = {}));
var Injectors = VideoPlayer.Injectors;

2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-alt.js.map
View File

@@ -1 +1 @@
{"version":3,"file":"cloudmedia-videoplayer-injectors-alt.js","sourceRoot":"","sources":["cloudmedia-videoplayer-injectors-alt.ts"],"names":["Orchard","Orchard.Azure","Orchard.Azure.MediaServices","Orchard.Azure.MediaServices.VideoPlayer","Orchard.Azure.MediaServices.VideoPlayer.Injectors","Orchard.Azure.MediaServices.VideoPlayer.Injectors.AltInjector","Orchard.Azure.MediaServices.VideoPlayer.Injectors.AltInjector.constructor","Orchard.Azure.MediaServices.VideoPlayer.Injectors.AltInjector.isSupported","Orchard.Azure.MediaServices.VideoPlayer.Injectors.AltInjector.inject","Orchard.Azure.MediaServices.VideoPlayer.Injectors.AltInjector.debug"],"mappings":"AAAA,4CAA4C;AAC5C,gDAAgD;;;;;;;AAEhD,IAAO,OAAO;AA4Cb,CA5CD,UAAO,OAAO;KAAdA,UAAeA,KAAKA;SAApBC,UAAqBA,aAAaA;aAAlCC,UAAmCA,WAAWA;iBAA9CC,UAA+CA,SAASA;oBAIpDC;wBAAiCC,8BAAQA;wBAErCA,qBACIA,SAAsBA,EACtBA,WAAmBA,EACnBA,YAAoBA,EACpBA,SAA0BA,EAC1BA,iBAA0BA,EAC1BA,cAAuBA,EACvBA,YAAsBA,EACtBA,gBAAkCA;4BAAIC,WAAMA,OAAAA,SAASA,EAAEA,WAAWA,EAAEA,YAAYA,EAAEA,KAAKA,EAAEA,SAASA,EAAEA,iBAAiBA,EAAEA,cAAcA,EAAEA,YAAYA,CAACA;4BAApJA,qBAAwBA,GAAhBA,gBAAgBA;AAAUA,wBAAoHA,CAACA;wBAE3JD,oCAAAA;4BACIE,OAAOA,IAAIA;wBACfA,CAACA;;wBAEDF,+BAAAA;4BACIG,IAAIA,mBAAmBA,GAAGA,CAACA,CAACA,IAAIA,CAACA,cAAcA,CAACA,CAACA,CAACA,eAAeA,CAACA,CAACA,KAAKA,CAACA,CAACA;;4BAE1EA,IAAIA,CAACA,KAAKA,CAACA,iDAAiDA,EAAEA,IAAIA,CAACA,SAASA,CAACA,EAAEA,CAACA;;4BAEhFA,IAAIA,OAAOA,GAAGA,CAACA,CAACA,OAAOA,CAACA,CACnBA,QAAQA,CAACA,+BAA+BA,CAACA,CACzCA,GAAGA,CAACA,OAAOA,EAAEA,IAAIA,CAACA,WAAWA,CAACA,CAC9BA,GAAGA,CAACA,QAAQA,EAAEA,IAAIA,CAACA,YAAYA,CAACA;4BACrCA,IAAIA,mBAAmBA;gCACnBA,OAAOA,CAACA,GAAGA,CAACA,kBAAkBA,EAAEA,OAAOA,GAAGA,mBAAmBA,CAACA,WAAWA,GAAGA,IAAIA,CAACA,CAACA;;4BAEtFA,IAAIA,KAAKA,GAAGA,CAACA,CAACA,OAAOA,CAACA,CAACA,QAAQA,CAACA,6BAA6BA,CAACA,CAACA,QAAQA,CAACA,OAAOA,CAACA;;4BAEhFA,IAAIA,IAAIA,CAACA,gBAAgBA;gCACrBA,CAACA,CAACA,IAAIA,CAACA,gBAAgBA,CAACA,CAACA,IAAIA,CAACA,UAAAA,IAAIA;oCAAMA,CAACA,CAACA,IAAIA,CAACA,CAACA,QAAQA,CAACA,KAAKA,CAACA;gCAAEA,CAACA,CAACA,CAACA;;4BAExEA,OAAOA,CAACA,QAAQA,CAACA,IAAIA,CAACA,SAASA,CAACA;wBACpCA,CAACA;;wBAEDH,8BAAAA,UAAaA,OAAeA;4BAAEI,IAAGA,IAAIA;AAAOA,iCAAdA,WAAcA,CAAdA,2BAAcA,EAAdA,IAAcA;gCAAdA,6BAAcA;;4BACxCA,gBAAKA,CAACA,KAAKA,KAACA,OAAAA,eAAeA,GAAGA,OAAOA,EAAEA,IAAIA,CAACA;wBAChDA,CAACA;wBACLJ,mBAACA;oBAADA,CAACA,EAvCgCD,0DAAQA,EAuCxCA;oBAvCDA,oCAuCCA;gBACLA,CAACA,yDAAAD;sDAAAA;YAADA,CAACA,iEAAAD;wDAAAA;QAADA,CAACA,qDAAAD;gDAAAA;IAADA,CAACA,yCAAAD;8BAAAA;AAADA,CAACA,6BAAA"}
{"version":3,"file":"cloudmedia-videoplayer-injectors-alt.js","sourceRoot":"","sources":["cloudmedia-videoplayer-injectors-alt.ts"],"names":["Orchard","Orchard.Azure","Orchard.Azure.MediaServices","Orchard.Azure.MediaServices.VideoPlayer","Orchard.Azure.MediaServices.VideoPlayer.Injectors","Orchard.Azure.MediaServices.VideoPlayer.Injectors.AltInjector","Orchard.Azure.MediaServices.VideoPlayer.Injectors.AltInjector.constructor","Orchard.Azure.MediaServices.VideoPlayer.Injectors.AltInjector.isSupported","Orchard.Azure.MediaServices.VideoPlayer.Injectors.AltInjector.inject","Orchard.Azure.MediaServices.VideoPlayer.Injectors.AltInjector.debug"],"mappings":"AAAA,4CAA4C;AAC5C,gDAAgD;;;;;;;AAEhD,IAAO,OAAO;AA4Cb,CA5CD,UAAO,OAAO;KAAdA,UAAeA,KAAKA;SAApBC,UAAqBA,aAAaA;aAAlCC,UAAmCA,WAAWA;iBAA9CC,UAA+CA,SAASA;oBAIpDC;wBAAiCC,8BAAQA;wBAErCA,qBACIA,SAAsBA,EACtBA,WAAmBA,EACnBA,YAAoBA,EACpBA,SAA0BA,EAC1BA,iBAA0BA,EAC1BA,cAAuBA,EACvBA,YAAsBA,EACtBA,gBAAkCA;4BAAIC,WAAMA,OAAAA,SAASA,EAAEA,WAAWA,EAAEA,YAAYA,EAAEA,KAAKA,EAAEA,SAASA,EAAEA,iBAAiBA,EAAEA,cAAcA,EAAEA,YAAYA,CAACA;4BAApJA,qBAAwBA,GAAhBA,gBAAgBA;AAAUA,wBAAoHA,CAACA;wBAE3JD,oCAAAA;4BACIE,OAAOA,IAAIA;wBACfA,CAACA;;wBAEDF,+BAAAA;4BACIG,IAAIA,mBAAmBA,GAAGA,CAACA,CAACA,IAAIA,CAACA,cAAcA,CAACA,CAACA,CAACA,eAAeA,CAACA,CAACA,KAAKA,CAACA,CAACA;;4BAE1EA,IAAIA,CAACA,KAAKA,CAACA,iDAAiDA,EAAEA,IAAIA,CAACA,SAASA,CAACA,EAAEA,CAACA;;4BAEhFA,IAAIA,OAAOA,GAAGA,CAACA,CAACA,OAAOA,CAACA,CACnBA,QAAQA,CAACA,+BAA+BA,CAACA,CACzCA,GAAGA,CAACA,OAAOA,EAAEA,IAAIA,CAACA,WAAWA,CAACA,CAC9BA,GAAGA,CAACA,QAAQA,EAAEA,IAAIA,CAACA,YAAYA,CAACA;4BACrCA,IAAIA,mBAAmBA;gCACnBA,OAAOA,CAACA,GAAGA,CAACA,kBAAkBA,EAAEA,OAAOA,GAAGA,mBAAmBA,CAACA,WAAWA,GAAGA,IAAIA,CAACA,CAACA;;4BAEtFA,IAAIA,KAAKA,GAAGA,CAACA,CAACA,OAAOA,CAACA,CAACA,QAAQA,CAACA,6BAA6BA,CAACA,CAACA,QAAQA,CAACA,OAAOA,CAACA;;4BAEhFA,IAAIA,IAAIA,CAACA,gBAAgBA;gCACrBA,CAACA,CAACA,IAAIA,CAACA,gBAAgBA,CAACA,CAACA,IAAIA,CAACA,UAAAA,IAAIA;oCAAMA,CAACA,CAACA,IAAIA,CAACA,CAACA,QAAQA,CAACA,KAAKA,CAACA;gCAAEA,CAACA,CAACA,CAACA;;4BAExEA,OAAOA,CAACA,QAAQA,CAACA,IAAIA,CAACA,SAASA,CAACA;wBACpCA,CAACA;;wBAEDH,8BAAAA,UAAaA,OAAeA;4BAAEI,IAAGA,IAAIA;AAAOA,iCAAdA,WAAcA,CAAdA,2BAAcA,EAAdA,IAAcA;gCAAdA,6BAAcA;;4BACxCA,gBAAKA,CAACA,KAAKA,KAACA,OAAAA,eAAeA,GAAGA,OAAOA,EAAEA,IAAIA,CAACA;wBAChDA,CAACA;wBACLJ,mBAACA;oBAADA,CAACA,EAvCgCD,kBAAQA,EAuCxCA;oBAvCDA,oCAuCCA;gBACLA,CAACA,yDAAAD;sDAAAA;YAADA,CAACA,iEAAAD;wDAAAA;QAADA,CAACA,qDAAAD;gDAAAA;IAADA,CAACA,yCAAAD;8BAAAA;AAADA,CAACA,6BAAA"}

2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-dash.js
View File

@@ -73,7 +73,7 @@ var Orchard;
_super.prototype.debug.call(this, "DashInjector: " + message, args);
};
return DashInjector;
})(Orchard.Azure.MediaServices.VideoPlayer.Injectors.Injector);
})(Injectors.Injector);
Injectors.DashInjector = DashInjector;
})(VideoPlayer.Injectors || (VideoPlayer.Injectors = {}));
var Injectors = VideoPlayer.Injectors;

2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-dash.js.map
View File

@@ -1 +1 @@
{"version":3,"file":"cloudmedia-videoplayer-injectors-dash.js","sourceRoot":"","sources":["cloudmedia-videoplayer-injectors-dash.ts"],"names":["Orchard","Orchard.Azure","Orchard.Azure.MediaServices","Orchard.Azure.MediaServices.VideoPlayer","Orchard.Azure.MediaServices.VideoPlayer.Injectors","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector.constructor","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector.isSupported","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector.inject","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector.debug"],"mappings":"AAAA,4CAA4C;AAC5C,gDAAgD;;;;;;;AAEhD,IAAO,OAAO;AAsEb,CAtED,UAAO,OAAO;KAAdA,UAAeA,KAAKA;SAApBC,UAAqBA,aAAaA;aAAlCC,UAAmCA,WAAWA;iBAA9CC,UAA+CA,SAASA;oBAkBpDC;wBAAkCC,+BAAQA;wBAA1CA;4BAAkCC,6BAAQA;wBAmD1CA,CAACA;AAAAD,wBAjDGA,qCAAAA;4BACIE,IAAIA,YAAYA,GAAqBA,QAAQA,CAACA,aAAaA,CAACA,OAAOA,CAACA;4BACpEA,IAAIA,GAAGA,GAAgBA,MAAMA,CAACA,aAAaA,CAACA,IAAIA,MAAMA,CAACA,mBAAmBA,CAACA;;4BAE3EA,IAAIA,OAAOA,GAAGA,YAAYA,IAAIA,YAAYA,CAACA,WAAWA,IAAIA,CAACA,CAACA,YAAYA,CAACA,WAAWA,CAACA,8CAA8CA,CAACA;4BACpIA,IAAIA,MAAMA,GAAGA,GAAGA,IAAIA,GAAGA,CAACA,eAAeA,IAAIA,GAAGA,CAACA,eAAeA,CAACA,mCAAmCA,CAACA;4BACnGA,IAAIA,gBAAgBA,GAAGA,CAACA,CAACA,IAAIA,CAACA,cAAcA,CAACA,CAACA,CAACA,kBAAkBA,CAACA,CAACA,GAAGA,CAACA,CAACA;;4BAExEA,IAAIA,CAACA,KAAKA,CAACA,+DAA+DA,EAAEA,OAAOA,CAACA;4BACpFA,IAAIA,CAACA,KAAKA,CAACA,uDAAuDA,EAAEA,MAAMA,CAACA;4BAC3EA,IAAIA,CAACA,KAAKA,CAACA,gDAAgDA,EAAEA,gBAAgBA,CAACA;;4BAE9EA,IAAIA,MAAMA,GAAGA,OAAOA,IAAIA,MAAMA,IAAIA,gBAAgBA;4BAClDA,IAAIA,CAACA,KAAKA,CAACA,4BAA4BA,EAAEA,MAAMA,CAACA;;4BAEhDA,OAAOA,MAAMA;wBACjBA,CAACA;;wBAEDF,gCAAAA;4BAAAG,iBA0BCA;4BAzBGA,IAAIA,iBAAiBA,GAAGA,CAACA,CAACA,IAAIA,CAACA,cAAcA,CAACA,CAACA,CAACA,kBAAkBA,CAACA,CAACA,KAAKA,CAACA,CAACA;4BAC3EA,IAAIA,mBAAmBA,GAAGA,CAACA,CAACA,IAAIA,CAACA,cAAcA,CAACA,CAACA,CAACA,eAAeA,CAACA,CAACA,KAAKA,CAACA,CAACA;;4BAE1EA,IAAIA,CAACA,KAAKA,CAACA,sCAAsCA,EAAEA,IAAIA,CAACA,SAASA,CAACA,EAAEA,CAACA;;4BAErEA,IAAIA,YAAYA,GAAGA,CAACA,CAACA,kBAAkBA,CAACA,CAACA,IAAIA,CAACA,OAAOA,EAAEA,IAAIA,CAACA,WAAWA,CAACA,CAACA,IAAIA,CAACA,QAAQA,EAAEA,IAAIA,CAACA,YAAYA,CAACA;4BAC1GA,IAAIA,mBAAmBA;gCACnBA,YAAYA,CAACA,IAAIA,CAACA,QAAQA,EAAEA,mBAAmBA,CAACA,WAAWA,CAACA,CAACA;4BACjEA,YAAYA,CAACA,QAAQA,CAACA,IAAIA,CAACA,SAASA,CAACA;;4BAErCA,IAAIA,GAAGA,GAAGA,iBAAiBA,CAACA,WAAWA;4BACvCA,IAAIA,OAAOA,GAAGA,IAAIA,IAAIA,CAACA,EAAEA,CAACA,WAAWA,CAACA,CAACA;4BACvCA,IAAIA,MAAMA,GAAGA,IAAIA,WAAWA,CAACA,OAAOA,CAACA;4BACrCA,MAAMA,CAACA,OAAOA,CAACA,CAACA;;4BAEhBA,MAAMA,CAACA,gBAAgBA,CAACA,OAAOA,EAAEA,UAACA,CAAuBA;gCACrDA,KAAIA,CAACA,KAAKA,CAACA,iFAAiFA,EAAEA,CAACA,CAACA,KAAKA,CAACA;;gCACtGA,kEAAkEA;gCAClEA,KAAIA,CAACA,KAAKA,CAACA,CAACA;4BAChBA,CAACA,CAACA;;4BAEFA,MAAMA,CAACA,KAAKA,CAACA,sBAAsBA,CAACA,KAAKA,CAACA;4BAC1CA,MAAMA,CAACA,UAAUA,CAACA,YAAYA,CAACA,CAACA,CAACA,CAACA;4BAClCA,MAAMA,CAACA,YAAYA,CAACA,GAAGA,CAACA;4BACxBA,MAAMA,CAACA,WAAWA,CAACA,IAAIA,CAACA,QAAQA,CAACA;wBACrCA,CAACA;;wBAEDH,+BAAAA,UAAaA,OAAeA;4BAAEI,IAAGA,IAAIA;AAAOA,iCAAdA,WAAcA,CAAdA,2BAAcA,EAAdA,IAAcA;gCAAdA,6BAAcA;;4BACxCA,gBAAKA,CAACA,KAAKA,KAACA,OAAAA,gBAAgBA,GAAGA,OAAOA,EAAEA,IAAIA,CAACA;wBACjDA,CAACA;wBACLJ,oBAACA;oBAADA,CAACA,EAnDiCD,0DAAQA,EAmDzCA;oBAnDDA,sCAmDCA;gBACLA,CAACA,yDAAAD;sDAAAA;YAADA,CAACA,iEAAAD;wDAAAA;QAADA,CAACA,qDAAAD;gDAAAA;IAADA,CAACA,yCAAAD;8BAAAA;AAADA,CAACA,6BAAA"}
{"version":3,"file":"cloudmedia-videoplayer-injectors-dash.js","sourceRoot":"","sources":["cloudmedia-videoplayer-injectors-dash.ts"],"names":["Orchard","Orchard.Azure","Orchard.Azure.MediaServices","Orchard.Azure.MediaServices.VideoPlayer","Orchard.Azure.MediaServices.VideoPlayer.Injectors","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector.constructor","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector.isSupported","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector.inject","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector.debug"],"mappings":"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"}

2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-html5.js
View File

@@ -111,7 +111,7 @@ var Orchard;
_super.prototype.debug.call(this, "Html5Injector: " + message, args);
};
return Html5Injector;
})(Orchard.Azure.MediaServices.VideoPlayer.Injectors.Injector);
})(Injectors.Injector);
Injectors.Html5Injector = Html5Injector;
})(VideoPlayer.Injectors || (VideoPlayer.Injectors = {}));
var Injectors = VideoPlayer.Injectors;

2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-html5.js.map
View File

File diff suppressed because one or more lines are too long

2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-smp.js
View File

@@ -87,7 +87,7 @@ var Orchard;
_super.prototype.debug.call(this, "SmpInjector: " + message, args);
};
return SmpInjector;
})(Orchard.Azure.MediaServices.VideoPlayer.Injectors.Injector);
})(Injectors.Injector);
Injectors.SmpInjector = SmpInjector;
function onSmpBridgeCreated(playerElementId) {

2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-smp.js.map
View File

@@ -1 +1 @@
{"version":3,"file":"cloudmedia-videoplayer-injectors-smp.js","sourceRoot":"","sources":["cloudmedia-videoplayer-injectors-smp.ts"],"names":["Orchard","Orchard.Azure","Orchard.Azure.MediaServices","Orchard.Azure.MediaServices.VideoPlayer","Orchard.Azure.MediaServices.VideoPlayer.Injectors","Orchard.Azure.MediaServices.VideoPlayer.Injectors.SmpInjector","Orchard.Azure.MediaServices.VideoPlayer.Injectors.SmpInjector.constructor","Orchard.Azure.MediaServices.VideoPlayer.Injectors.SmpInjector.isSupported","Orchard.Azure.MediaServices.VideoPlayer.Injectors.SmpInjector.inject","Orchard.Azure.MediaServices.VideoPlayer.Injectors.SmpInjector.onMediaPlayerStateChange","Orchard.Azure.MediaServices.VideoPlayer.Injectors.SmpInjector.debug","Orchard.Azure.MediaServices.VideoPlayer.Injectors.onSmpBridgeCreated"],"mappings":"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"}
{"version":3,"file":"cloudmedia-videoplayer-injectors-smp.js","sourceRoot":"","sources":["cloudmedia-videoplayer-injectors-smp.ts"],"names":["Orchard","Orchard.Azure","Orchard.Azure.MediaServices","Orchard.Azure.MediaServices.VideoPlayer","Orchard.Azure.MediaServices.VideoPlayer.Injectors","Orchard.Azure.MediaServices.VideoPlayer.Injectors.SmpInjector","Orchard.Azure.MediaServices.VideoPlayer.Injectors.SmpInjector.constructor","Orchard.Azure.MediaServices.VideoPlayer.Injectors.SmpInjector.isSupported","Orchard.Azure.MediaServices.VideoPlayer.Injectors.SmpInjector.inject","Orchard.Azure.MediaServices.VideoPlayer.Injectors.SmpInjector.onMediaPlayerStateChange","Orchard.Azure.MediaServices.VideoPlayer.Injectors.SmpInjector.debug","Orchard.Azure.MediaServices.VideoPlayer.Injectors.onSmpBridgeCreated"],"mappings":"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"}

2
src/Orchard.Web/Modules/Orchard.MediaLibrary/Drivers/MediaLibraryPickerFieldDriver.cs
View File

@@ -51,7 +51,7 @@ namespace Orchard.MediaLibrary.Drivers {
}
protected override DriverResult Editor(ContentPart part, Fields.MediaLibraryPickerField field, IUpdateModel updater, dynamic shapeHelper) {
var model = new MediaLibraryPickerFieldViewModel();
var model = new MediaLibraryPickerFieldViewModel { SelectedIds = string.Join(",", field.Ids) };
updater.TryUpdateModel(model, GetPrefix(field, part), null, null);

6
src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj
View File

@@ -58,11 +58,7 @@
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\lib\aspnetwebapi\System.Net.Http.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />

9
src/Orchard/Indexing/ISearchBuilder.cs
View File

@@ -26,12 +26,17 @@ namespace Orchard.Indexing {
/// </summary>
ISearchBuilder Forbidden();
/// <summary>
/// Applied on string clauses, the searched value will not be tokenized.
/// </summary>
ISearchBuilder NotAnalyzed();
/// <summary>
/// Applied on string clauses, it removes the default Prefix mecanism. Like 'broadcast' won't
/// return 'broadcasting'.
/// return 'broadcasting'.
/// </summary>
ISearchBuilder ExactMatch();
/// <summary>
/// Apply a specific boost to a clause.
/// </summary>

6
src/Orchard/Indexing/NullSearchBuilder.cs
View File

@@ -69,7 +69,11 @@ namespace Orchard.Indexing {
public ISearchBuilder ExactMatch() {
return this;
}
public ISearchBuilder NotAnalyzed() {
return this;
}
/// <summary>
/// Apply a specific boost to a clause.
/// </summary>