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

Bug Fix #30: Upload File & Capture Image Buttons

Browse Source 
Now both buttons work as expected, rather than having to refresh that
page to gain access to the other feature.
This commit is contained in:
Gary Sharp
2013-12-02 17:21:56 +11:00
parent 2dd3f5f9ab
commit fad8eae9f4
2 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Views/Job/JobParts/Resources.cshtml
+34 -34
View File
@@ -322,45 +322,45 @@
showDialog('/File'); showDialog('/File');
}); });
var silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
function showDialog(navigationPath) { function showDialog(navigationPath) {
if (!$dialogUpload) { if (!$dialogUpload) {
Silverlight.createObject( Silverlight.createObject(
'@(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap)', '@(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap)',
$('#silverlightHostUploadAttachment').get(0), $('#silverlightHostUploadAttachment').get(0),
'silverlightUploadAttachment', 'silverlightUploadAttachment',
{ width: '840px', height: '500px', background: 'white', version: '4.0.60310.0' }, { width: '840px', height: '500px', background: 'white', version: '4.0.60310.0' },
{ {
onLoad: function () { onLoad: function () {
if (onLoadNavigation) { if (onLoadNavigation) {
$('#silverlightUploadAttachment').get(0).content.Navigator.Navigate(onLoadNavigation); $('#silverlightUploadAttachment').get(0).content.Navigator.Navigate(onLoadNavigation);
isLoaded = true; 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({ $dialogUpload = $('#dialogUpload').dialog({
autoOpen: false, autoOpen: false,
draggable: false, draggable: false,
modal: true, modal: true,
resizable: false, resizable: false,
width: 860, width: 860,
height: 550, height: 550,
close: function () { close: function () {
if (silverlightUploadAttachment && silverlightUploadAttachment.content) var sl = $('#silverlightUploadAttachment').get(0);
silverlightUploadAttachment.content.Navigator.Navigate('/Hidden'); if (sl.content)
} sl.content.Navigator.Navigate('/Hidden');
}); }
} });
$dialogUpload.dialog('open');
if (isLoaded) { }
silverlightUploadAttachment.content.Navigator.Navigate(navigationPath); $dialogUpload.dialog('open');
} else { if (isLoaded) {
onLoadNavigation = navigationPath; $('#silverlightUploadAttachment').get(0).content.Navigator.Navigate(navigationPath);
} } else {
}; onLoadNavigation = navigationPath;
}
};
//#endregion //#endregion
</text>} </text>}
Disco.Web/Views/Job/JobParts/Resources.generated.cs
+39 -39
View File
@@ -1038,63 +1038,63 @@ WriteLiteral(@"
showDialog('/File'); showDialog('/File');
}); });
var silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
function showDialog(navigationPath) { function showDialog(navigationPath) {
if (!$dialogUpload) { if (!$dialogUpload) {
Silverlight.createObject( Silverlight.createObject(
'"); '");
#line 329 "..\..\Views\Job\JobParts\Resources.cshtml" #line 328 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap); Write(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap);
#line default #line default
#line hidden #line hidden
WriteLiteral(@"', WriteLiteral(@"',
$('#silverlightHostUploadAttachment').get(0), $('#silverlightHostUploadAttachment').get(0),
'silverlightUploadAttachment', 'silverlightUploadAttachment',
{ width: '840px', height: '500px', background: 'white', version: '4.0.60310.0' }, { width: '840px', height: '500px', background: 'white', version: '4.0.60310.0' },
{ {
onLoad: function () { onLoad: function () {
if (onLoadNavigation) { if (onLoadNavigation) {
$('#silverlightUploadAttachment').get(0).content.Navigator.Navigate(onLoadNavigation); $('#silverlightUploadAttachment').get(0).content.Navigator.Navigate(onLoadNavigation);
isLoaded = true; isLoaded = true;
}
} }
} },
}, 'UploadUrl=");
'UploadUrl=");
#line 341 "..\..\Views\Job\JobParts\Resources.cshtml" #line 340 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null))); Write(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null)));
#line default #line default
#line hidden #line hidden
WriteLiteral(@"' WriteLiteral(@"');
);
$dialogUpload = $('#dialogUpload').dialog({ $dialogUpload = $('#dialogUpload').dialog({
autoOpen: false, autoOpen: false,
draggable: false, draggable: false,
modal: true, modal: true,
resizable: false, resizable: false,
width: 860, width: 860,
height: 550, height: 550,
close: function () { close: function () {
if (silverlightUploadAttachment && silverlightUploadAttachment.content) var sl = $('#silverlightUploadAttachment').get(0);
silverlightUploadAttachment.content.Navigator.Navigate('/Hidden'); if (sl.content)
} sl.content.Navigator.Navigate('/Hidden');
}); }
} });
$dialogUpload.dialog('open');
if (isLoaded) { }
silverlightUploadAttachment.content.Navigator.Navigate(navigationPath); $dialogUpload.dialog('open');
} else { if (isLoaded) {
onLoadNavigation = navigationPath; $('#silverlightUploadAttachment').get(0).content.Navigator.Navigate(navigationPath);
} } else {
}; onLoadNavigation = navigationPath;
}
};
//#endregion //#endregion
"); ");