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
+6 -6
View File
@@ -322,7 +322,6 @@
showDialog('/File'); showDialog('/File');
}); });
var silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
function showDialog(navigationPath) { function showDialog(navigationPath) {
if (!$dialogUpload) { if (!$dialogUpload) {
Silverlight.createObject( Silverlight.createObject(
@@ -338,8 +337,7 @@
} }
} }
}, },
'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,
@@ -349,14 +347,16 @@
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'); $dialogUpload.dialog('open');
if (isLoaded) { if (isLoaded) {
silverlightUploadAttachment.content.Navigator.Navigate(navigationPath); $('#silverlightUploadAttachment').get(0).content.Navigator.Navigate(navigationPath);
} else { } else {
onLoadNavigation = navigationPath; onLoadNavigation = navigationPath;
} }
Disco.Web/Views/Job/JobParts/Resources.generated.cs
+8 -8
View File
@@ -1038,14 +1038,13 @@ 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);
@@ -1066,14 +1065,13 @@ WriteLiteral(@"',
'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,
@@ -1083,14 +1081,16 @@ WriteLiteral(@"'
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'); $dialogUpload.dialog('open');
if (isLoaded) { if (isLoaded) {
silverlightUploadAttachment.content.Navigator.Navigate(navigationPath); $('#silverlightUploadAttachment').get(0).content.Navigator.Navigate(navigationPath);
} else { } else {
onLoadNavigation = navigationPath; onLoadNavigation = navigationPath;
} }