zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

webdav portal edit fix

Browse source
This commit is contained in:
vfedosevich 2015-02-03 05:07:16 -08:00
parent 0509b5ff1c
commit 5795ffb0bc
4 changed files with 19 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs
View file

@ -31,10 +31,10 @@ namespace WebsitePanel.WebDav.Core.Owa
OwnerId = WspContext.User.Login, OwnerId = WspContext.User.Login,
Size = resource.ContentLength, Size = resource.ContentLength,
Version = DateTime.Now.ToString("s"), Version = DateTime.Now.ToString("s"),
SupportsCoauth = false, SupportsCoauth = true,
SupportsCobalt = true, SupportsCobalt = true,
SupportsFolders = true, SupportsFolders = true,
SupportsLocks = false, SupportsLocks = true,
SupportsScenarioLinks = false, SupportsScenarioLinks = false,
SupportsSecureStore = false, SupportsSecureStore = false,
SupportsUpdate = true, SupportsUpdate = true,

12
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/Api/OwaController.cs
View file

@ -73,13 +73,9 @@ namespace WebsitePanel.WebDavPortal.Controllers.Api
} }
[HttpPost] [HttpPost]
public async Task<HttpResponseMessage> Cobalt(int accessTokenId) public HttpResponseMessage Cobalt(int accessTokenId)
{ {
var memoryStream = new MemoryStream(); var responseBatch = _cobaltManager.ProcessRequest(accessTokenId, HttpContext.Current.Request.InputStream);
await Request.Content.CopyToAsync(memoryStream);
var responseBatch = _cobaltManager.ProcessRequest(accessTokenId, memoryStream);
var correlationId = Request.Headers.GetValues("X-WOPI-CorrelationID").FirstOrDefault() ?? ""; var correlationId = Request.Headers.GetValues("X-WOPI-CorrelationID").FirstOrDefault() ?? "";
@ -90,11 +86,9 @@ namespace WebsitePanel.WebDavPortal.Controllers.Api
{ {
responseBatch.CopyTo(stream); responseBatch.CopyTo(stream);
stream.Close(); stream.Close();
}); }, "application/octet-stream");
response.Content.Headers.ContentType = new MediaTypeHeaderValue("application/octet-stream");
response.Content.Headers.ContentLength = responseBatch.Length; response.Content.Headers.ContentLength = responseBatch.Length;
response.Headers.Add("X-WOPI-CorellationID", correlationId); response.Headers.Add("X-WOPI-CorellationID", correlationId);
response.Headers.Add("request-id", correlationId); response.Headers.Add("request-id", correlationId);

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
View file

@ -97,7 +97,7 @@ namespace WebsitePanel.WebDavPortal.Controllers
string wopiSrc = Server.UrlDecode(url); string wopiSrc = Server.UrlDecode(url);
string owaOpenerUri = permissions.HasFlag(WebDavPermissions.Write) ? owaOpener.OwaView : owaOpener.OwaView; string owaOpenerUri = permissions.HasFlag(WebDavPermissions.Write) ? owaOpener.OwaEditor : owaOpener.OwaView;
var uri = string.Format("{0}/{1}WOPISrc={2}&access_token={3}", WebDavAppConfigManager.Instance.OfficeOnline.Url, owaOpenerUri, Server.UrlEncode(wopiSrc), Server.UrlEncode(accessToken.AccessToken.ToString("N"))); var uri = string.Format("{0}/{1}WOPISrc={2}&access_token={3}", WebDavAppConfigManager.Instance.OfficeOnline.Url, owaOpenerUri, Server.UrlEncode(wopiSrc), Server.UrlEncode(accessToken.AccessToken.ToString("N")));

32
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp.js
View file

@ -19,25 +19,6 @@ $(document).on('click', '.element-container', function (e) {
} else { } else {
if (isMobileDevice()) {
var now = new Date().getTime();
var lastTouch = $(this).data('lastTouch') || now + 1;
var delta = now - lastTouch;
if (delta < 500 && delta > 0) {
wsp.fileBrowser.openItem(this);
$(this).data('lastTouch', 0);
} else {
wsp.fileBrowser.clearAllSelectedItems();
wsp.fileBrowser.selectItem(this);
}
$(this).data('lastTouch', now);
}
wsp.fileBrowser.clearAllSelectedItems(); wsp.fileBrowser.clearAllSelectedItems();
wsp.fileBrowser.selectItem(this); wsp.fileBrowser.selectItem(this);
@ -46,6 +27,19 @@ $(document).on('click', '.element-container', function (e) {
wsp.fileBrowser.refreshDeletionBlock(); wsp.fileBrowser.refreshDeletionBlock();
}); });
$(document).on('touchstart', '.element-container', function(e) {
var now = new Date().getTime();
var lastTouch = $(this).data('lastTouch') || now + 1;
var delta = now - lastTouch;
if (delta < 300 && delta > 0) {
wsp.fileBrowser.openItem(this);
$(this).data('lastTouch', 0);
}
$(this).data('lastTouch', now);
});
//Double click file open //Double click file open
$(document).on('dblclick', '.element-container', function (e) { $(document).on('dblclick', '.element-container', function (e) {
wsp.fileBrowser.openItem(this); wsp.fileBrowser.openItem(this);