Skip to content

Commit de93c72

Browse files
committed
URIBuilder は非推奨となったため使用しないように修正。
1 parent 11def0e commit de93c72

2 files changed

Lines changed: 14 additions & 47 deletions

File tree

dConnectJavascriptApp/js/profile/file.js

Lines changed: 14 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -562,19 +562,8 @@ function showFileSend(serviceId) {
562562
reloadHeader(btnStr);
563563
reloadFooter(btnStr);
564564

565-
let builder = new sdk.URIBuilder();
566-
builder.setProfile('file');
567-
let uri = builder.build();
568-
569-
if (DEBUG) {
570-
console.log('Uri: ' + uri);
571-
}
572-
573565
let str = '';
574-
str += '<form action="' + uri + '" method="POST"' +
575-
' enctype="multipart/form-data" id="fileForm"><br>';
576-
str += '<input type="hidden" name="serviceId" value="' + serviceId + '"/>';
577-
str += '<input type="hidden" name="accessToken" value="' + sdk.getAccessToken() + '"/>';
566+
str += '<form id="fileForm"><br>';
578567
str += makeSelectBoolean('forceOverwrite');
579568
str += makeInputText('path', 'path', 'path');
580569
str += makeInputText('uri', 'uri', 'uri');
@@ -606,37 +595,20 @@ function doFileSend(serviceId) {
606595
showLoading();
607596

608597
let myForm = document.getElementById('fileForm');
609-
let myFormData = new FormData(myForm);
610-
611-
try {
612-
if (myFormData.get('uri') === '') {
613-
myFormData.delete('uri');
614-
}
615-
} catch (e) {
616-
}
598+
let inputs = myForm.elements;
599+
let params = { serviceId };
600+
parseInputElements(inputs, params);
617601

618-
let myXhr = new XMLHttpRequest();
619-
myXhr.open(myForm.method, myForm.action, true);
620-
myXhr.onreadystatechange = function() {
621-
if (myXhr.readyState === 4) {
622-
if (myXhr.status === 200 || myXhr.status == 0) {
623-
if (DEBUG) {
624-
console.log('Response:' + myXhr.responseText)
625-
}
626-
let str = '';
627-
let obj = JSON.parse(myXhr.responseText);
628-
if (obj.result == 0) {
629-
alert('success:file/send');
630-
} else {
631-
showError('PUT file/send', obj.errorCode, obj.errorMessage);
632-
}
633-
} else {
634-
alert('error:' + myXhr.status);
635-
}
636-
closeLoading();
637-
}
638-
};
639-
myXhr.send(myFormData);
602+
sdk.post({
603+
profile: 'file',
604+
params
605+
}).then(json => {
606+
closeLoading();
607+
alert('success:file/send');
608+
}).catch(e => {
609+
closeLoading();
610+
showError('PUT file/send', e.errorCode, e.errorMessage);
611+
});
640612
}
641613

642614
/**

dConnectJavascriptApp/js/profile/notification.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ function showNotification(serviceId) {
2929

3030
setTitle('Notification Profile(Notify)');
3131

32-
let builder = new sdk.URIBuilder();
33-
builder.setProfile('notification');
34-
builder.setAttribute('notify');
35-
let uri = builder.build();
36-
3732
let str = '';
3833
str += '<form id="notificationForm" name="notificationForm">';
3934

0 commit comments

Comments
 (0)