jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature #44: Image capture WebRTC & HTML5 FileIO

Browse Source 
Silverlight was previously used to capture webcam pictures and upload
file attachments. HTML5 FileIO is now used for all attachment uploading
- including drag-drop support. WebRTC is used to capture webcam images -
this falls back to a Flash polyfill when WebRTC isn't supported.
This commit is contained in:
Gary Sharp
2014-06-05 21:01:43 +10:00
parent d040ab094c
commit b64ac3b16f
40 changed files with 3221 additions and 2444 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Disco.Web.csproj
+14 -13
View File
@@ -948,7 +948,6 @@
</ItemGroup>
<ItemGroup>
<Content Include="ClientBin\Disco.ClientBootstrapper.exe" />
<Content Include="ClientBin\Disco.Silverlight.AttachmentUpload.xap" />
<None Include="Areas\Config\Views\AuthorizationRole\Create.cshtml">
<Generator>RazorGenerator</Generator>
<LastGenOutput>Create.generated.cs</LastGenOutput>
@@ -1015,6 +1014,16 @@
<Content Include="ClientSource\Scripts\Core.min.js">
<DependentUpon>Core.js.bundle</DependentUpon>
</Content>
<None Include="ClientSource\Scripts\Modules\Disco-AttachmentUploader.js">
<DependentUpon>Disco-AttachmentUploader.js.bundle</DependentUpon>
</None>
<Content Include="ClientSource\Scripts\Modules\Disco-AttachmentUploader.min.js">
<DependentUpon>Disco-AttachmentUploader.js.bundle</DependentUpon>
</Content>
<None Include="ClientSource\Scripts\Modules\Disco-AttachmentUploader.js.bundle" />
<None Include="ClientSource\Scripts\Modules\Disco-AttachmentUploader.min.js.map">
<DependentUpon>Disco-AttachmentUploader.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\jQuery-Fancytree.js">
<DependentUpon>jQuery-Fancytree.js.bundle</DependentUpon>
</None>
@@ -1064,6 +1073,8 @@
<None Include="ClientSource\Scripts\Modules\Disco-CreateJob.js">
<DependentUpon>Disco-CreateJob.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\Disco-AttachmentUploader\webcam.js" />
<Content Include="ClientSource\Scripts\Modules\Disco-AttachmentUploader\webcam.swf" />
<Content Include="ClientSource\Scripts\Modules\Disco-CreateJob.min.js">
<DependentUpon>Disco-CreateJob.js.bundle</DependentUpon>
</Content>
@@ -1082,6 +1093,7 @@
<None Include="ClientSource\Scripts\Modules\Disco-jQueryExtensions.js">
<DependentUpon>Disco-jQueryExtensions.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\Disco-AttachmentUploader\disco-attachmentuploader.js" />
<Content Include="ClientSource\Scripts\Modules\Disco-jQueryExtensions.min.js">
<DependentUpon>Disco-jQueryExtensions.js.bundle</DependentUpon>
</Content>
@@ -1136,10 +1148,6 @@
<DependentUpon>Shadowbox.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\Shadowbox\shadowbox.js" />
<None Include="ClientSource\Scripts\Modules\Silverlight.min.js.map">
<DependentUpon>Silverlight.js.bundle</DependentUpon>
</None>
<None Include="ClientSource\Scripts\Modules\Silverlight\Silverlight.js" />
<None Include="ClientSource\Scripts\Modules\jQuery-SignalR.js">
<DependentUpon>jQuery-SignalR.js.bundle</DependentUpon>
</None>
@@ -1171,12 +1179,6 @@
<Content Include="ClientSource\Scripts\Modules\Shadowbox.min.js">
<DependentUpon>Shadowbox.js.bundle</DependentUpon>
</Content>
<None Include="ClientSource\Scripts\Modules\Silverlight.js">
<DependentUpon>Silverlight.js.bundle</DependentUpon>
</None>
<Content Include="ClientSource\Scripts\Modules\Silverlight.min.js">
<DependentUpon>Silverlight.js.bundle</DependentUpon>
</Content>
<None Include="ClientSource\Scripts\Modules\Timeline.min.js.map">
<DependentUpon>Timeline.js.bundle</DependentUpon>
</None>
@@ -1506,7 +1508,6 @@
<None Include="ClientSource\Scripts\Modules\Disco-CreateJob.js.bundle" />
<None Include="ClientSource\Scripts\Modules\tinymce.js.bundle" />
<None Include="ClientSource\Scripts\Modules\Timeline.js.bundle" />
<None Include="ClientSource\Scripts\Modules\Silverlight.js.bundle" />
<None Include="ClientSource\Scripts\Modules\Shadowbox.js.bundle" />
<None Include="ClientSource\Scripts\Modules\Knockout.js.bundle" />
<None Include="ClientSource\Scripts\Modules\jQueryUI-TimePicker.js.bundle" />
@@ -2111,7 +2112,7 @@
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
<UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" />
<UserProperties BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />