diff --git a/Disco.Web/Views/Job/JobParts/Resources.cshtml b/Disco.Web/Views/Job/JobParts/Resources.cshtml index 4175dc62..fce159e7 100644 --- a/Disco.Web/Views/Job/JobParts/Resources.cshtml +++ b/Disco.Web/Views/Job/JobParts/Resources.cshtml @@ -322,45 +322,45 @@ showDialog('/File'); }); - var silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0); function showDialog(navigationPath) { if (!$dialogUpload) { Silverlight.createObject( - '@(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap)', - $('#silverlightHostUploadAttachment').get(0), - 'silverlightUploadAttachment', - { width: '840px', height: '500px', background: 'white', version: '4.0.60310.0' }, - { - onLoad: function () { - if (onLoadNavigation) { - $('#silverlightUploadAttachment').get(0).content.Navigator.Navigate(onLoadNavigation); - isLoaded = true; + '@(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap)', + $('#silverlightHostUploadAttachment').get(0), + 'silverlightUploadAttachment', + { width: '840px', height: '500px', background: 'white', version: '4.0.60310.0' }, + { + onLoad: function () { + if (onLoadNavigation) { + $('#silverlightUploadAttachment').get(0).content.Navigator.Navigate(onLoadNavigation); + isLoaded = true; + } } - } - }, - 'UploadUrl=@(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null)))' - ); + }, + 'UploadUrl=@(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null)))'); - $dialogUpload = $('#dialogUpload').dialog({ - autoOpen: false, - draggable: false, - modal: true, - resizable: false, - width: 860, - height: 550, - close: function () { - if (silverlightUploadAttachment && silverlightUploadAttachment.content) - silverlightUploadAttachment.content.Navigator.Navigate('/Hidden'); - } - }); - } - $dialogUpload.dialog('open'); - if (isLoaded) { - silverlightUploadAttachment.content.Navigator.Navigate(navigationPath); - } else { - onLoadNavigation = navigationPath; - } - }; + $dialogUpload = $('#dialogUpload').dialog({ + autoOpen: false, + draggable: false, + modal: true, + resizable: false, + width: 860, + height: 550, + close: function () { + var sl = $('#silverlightUploadAttachment').get(0); + if (sl.content) + sl.content.Navigator.Navigate('/Hidden'); + } + }); + + } + $dialogUpload.dialog('open'); + if (isLoaded) { + $('#silverlightUploadAttachment').get(0).content.Navigator.Navigate(navigationPath); + } else { + onLoadNavigation = navigationPath; + } + }; //#endregion } diff --git a/Disco.Web/Views/Job/JobParts/Resources.generated.cs b/Disco.Web/Views/Job/JobParts/Resources.generated.cs index c5a1c8ef..7a8d0b97 100644 --- a/Disco.Web/Views/Job/JobParts/Resources.generated.cs +++ b/Disco.Web/Views/Job/JobParts/Resources.generated.cs @@ -1038,63 +1038,63 @@ WriteLiteral(@" showDialog('/File'); }); - var silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0); function showDialog(navigationPath) { if (!$dialogUpload) { Silverlight.createObject( - '"); + '"); - #line 329 "..\..\Views\Job\JobParts\Resources.cshtml" - Write(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap); + #line 328 "..\..\Views\Job\JobParts\Resources.cshtml" + Write(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap); #line default #line hidden WriteLiteral(@"', - $('#silverlightHostUploadAttachment').get(0), - 'silverlightUploadAttachment', - { width: '840px', height: '500px', background: 'white', version: '4.0.60310.0' }, - { - onLoad: function () { - if (onLoadNavigation) { - $('#silverlightUploadAttachment').get(0).content.Navigator.Navigate(onLoadNavigation); - isLoaded = true; + $('#silverlightHostUploadAttachment').get(0), + 'silverlightUploadAttachment', + { width: '840px', height: '500px', background: 'white', version: '4.0.60310.0' }, + { + onLoad: function () { + if (onLoadNavigation) { + $('#silverlightUploadAttachment').get(0).content.Navigator.Navigate(onLoadNavigation); + isLoaded = true; + } } - } - }, - 'UploadUrl="); + }, + 'UploadUrl="); - #line 341 "..\..\Views\Job\JobParts\Resources.cshtml" - Write(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null))); + #line 340 "..\..\Views\Job\JobParts\Resources.cshtml" + Write(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null))); #line default #line hidden -WriteLiteral(@"' - ); +WriteLiteral(@"'); - $dialogUpload = $('#dialogUpload').dialog({ - autoOpen: false, - draggable: false, - modal: true, - resizable: false, - width: 860, - height: 550, - close: function () { - if (silverlightUploadAttachment && silverlightUploadAttachment.content) - silverlightUploadAttachment.content.Navigator.Navigate('/Hidden'); - } - }); - } - $dialogUpload.dialog('open'); - if (isLoaded) { - silverlightUploadAttachment.content.Navigator.Navigate(navigationPath); - } else { - onLoadNavigation = navigationPath; - } - }; + $dialogUpload = $('#dialogUpload').dialog({ + autoOpen: false, + draggable: false, + modal: true, + resizable: false, + width: 860, + height: 550, + close: function () { + var sl = $('#silverlightUploadAttachment').get(0); + if (sl.content) + sl.content.Navigator.Navigate('/Hidden'); + } + }); + + } + $dialogUpload.dialog('open'); + if (isLoaded) { + $('#silverlightUploadAttachment').get(0).content.Navigator.Navigate(navigationPath); + } else { + onLoadNavigation = navigationPath; + } + }; //#endregion ");