Merge pull request #204 from TakayukiHoshi1984/bugfix_missing_uri

不具合修正: POST用のUIが表示されない

Author: TakayukiHoshi1984

dConnectJavascriptApp/js/profile/canvas.js

@@ -55,16 +55,12 @@ function showCanvasDrawImage(serviceId) {
                   serviceId);
   reloadHeader(btnStr);
   reloadFooter(btnStr);
+
   /* ※省略パラメータがあり1種類のformでは対応できないため2つformを用意しています。 */
 
   let str = '';
 
-  str += '<form action="' + uri + '" method="POST"' +
-          ' enctype="multipart/form-data" id="fileForm"><br>';
-  str += '<input type="hidden" name="serviceId" value="' + serviceId + '"/>';
-  str += '<input type="hidden" name="accessToken" value="' +
-          sdk.getAccessToken() + '"/>';
-
+  str += '<form id="fileForm"><br>';
   str += makeInputText('path', 'path', 'path');
   str += makeInputText('uri', 'uri', 'uri');
   str += makeInputText('MIME-Type', 'mimeType', 'mimeType');
@@ -114,38 +110,22 @@ function doCanvasDrawImage(serviceId, fileFormId) {
   showLoading();
 
   let myForm = document.getElementById(fileFormId);
-  let myFormData = new FormData(myForm);
-  let myXhr = new XMLHttpRequest();
-  try {
-    if (!myFormData.get('mode')) {
-      myFormData.delete('mode');
-    }
-  } catch (e) {
-    // Safariなどでは、FormData#append以外はサポートしていないため、エラーが出る
-  }
-  myXhr.open(myForm.method, myForm.action, true);
-  myXhr.onreadystatechange = function() {
-    if (myXhr.readyState === 4) {
-      if (myXhr.status === 200 || myXhr.status == 0) {
-        if (DEBUG) {
-          console.log('Response:' + myXhr.responseText)
-        }
-        let str = '';
-        let obj = JSON.parse(myXhr.responseText);
-        if (obj.result == 0) {
-          //alert('success:canvas/drawimage');
-          $('#path').val('');
-          $('#data').val('');
-        } else {
-          showError('POST canvas/drawimage', obj.errorCode, obj.errorMessage);
-        }
-      } else {
-        alert('error:' + myXhr.status);
-      }
-      closeLoading();
-    }
-  };
-  myXhr.send(myFormData);
+  let inputs = myForm.elements;
+  let params = { serviceId };
+  parseInputElements(inputs, params);
+
+  sdk.post({
+    profile: 'canvas',
+    attribute: 'drawImage',
+    params
+  }).then(json => {
+    closeLoading();
+    $('#path').val('');
+    $('#data').val('');
+  }).catch(e => {
+    closeLoading();
+    showError('POST canvas/drawimage', e.errorCode, e.errorMessage);
+  });
 }
 
 /**

dConnectJavascriptApp/js/profile/file.js

@@ -562,19 +562,8 @@ function showFileSend(serviceId) {
   reloadHeader(btnStr);
   reloadFooter(btnStr);
 
-  let builder = new sdk.URIBuilder();
-  builder.setProfile('file');
-  let uri = builder.build();
-
-  if (DEBUG) {
-    console.log('Uri: ' + uri);
-  }
-
   let str = '';
-  str += '<form action="' + uri + '" method="POST"' +
-        ' enctype="multipart/form-data" id="fileForm"><br>';
-  str += '<input type="hidden" name="serviceId" value="' + serviceId + '"/>';
-  str += '<input type="hidden" name="accessToken" value="' + sdk.getAccessToken() + '"/>';
+  str += '<form id="fileForm"><br>';
   str += makeSelectBoolean('forceOverwrite');
   str += makeInputText('path', 'path', 'path');
   str += makeInputText('uri', 'uri', 'uri');
@@ -606,37 +595,20 @@ function doFileSend(serviceId) {
   showLoading();
 
   let myForm = document.getElementById('fileForm');
-  let myFormData = new FormData(myForm);
-
-  try {
-    if (myFormData.get('uri') === '') {
-      myFormData.delete('uri');
-    }
-  } catch (e) {
-  }
+  let inputs = myForm.elements;
+  let params = { serviceId };
+  parseInputElements(inputs, params);
 
-  let myXhr = new XMLHttpRequest();
-  myXhr.open(myForm.method, myForm.action, true);
-  myXhr.onreadystatechange = function() {
-    if (myXhr.readyState === 4) {
-      if (myXhr.status === 200 || myXhr.status == 0) {
-        if (DEBUG) {
-          console.log('Response:' + myXhr.responseText)
-        }
-        let str = '';
-        let obj = JSON.parse(myXhr.responseText);
-        if (obj.result == 0) {
-          alert('success:file/send');
-        } else {
-          showError('PUT file/send', obj.errorCode, obj.errorMessage);
-        }
-      } else {
-        alert('error:' + myXhr.status);
-      }
-      closeLoading();
-    }
-  };
-  myXhr.send(myFormData);
+  sdk.post({
+    profile: 'file',
+    params
+  }).then(json => {
+    closeLoading();
+    alert('success:file/send');
+  }).catch(e => {
+    closeLoading();
+    showError('PUT file/send', e.errorCode, e.errorMessage);
+  });
 }
 
 /**

dConnectJavascriptApp/js/profile/notification.js

@@ -30,9 +30,7 @@ function showNotification(serviceId) {
   setTitle('Notification Profile(Notify)');
 
   let str = '';
-  str += '<form action="' + uri + '" method="POST" id="notificationForm"' +
-        ' name="notificationForm" enctype="multipart/form-data"' +
-        ' onsubmit="return false;">';
+  str += '<form id="notificationForm" name="notificationForm">';
 
   if (myDeviceName.indexOf('Pebble') == -1 &&
       myDeviceName.indexOf('SmartWatch') == -1 &&
@@ -254,39 +252,32 @@ function doUnregisterNotificationError(serviceId) {
  */
 function doNotificationNotify(serviceId) {
   let myForm = document.getElementById('notificationForm');
-  let myFormData = new FormData(myForm);
-  let myXhr = new XMLHttpRequest();
-  myXhr.open(myForm.method, myForm.action, true);
-  myXhr.onreadystatechange = function() {
-    if (myXhr.readyState === 4) {
-      if (myXhr.status === 200 || myXhr.status == 0) {
-        if (DEBUG) {
-          console.log('Response:' + myXhr.responseText)
-        }
-        let obj = JSON.parse(myXhr.responseText);
-        if (obj.result == 0) {
-          let str = '';
-          if (myDeviceName.indexOf('Pebble') != -1) {
-          } else if (myDeviceName.indexOf('SmartWatch') != -1) {
-          } else {
-            str += '<center>';
-            str += '<input type="button" onclick="notificationDel(\'' +
-                    serviceId + '\',\'' + obj.notificationId +
-                    '\');" value="Delete" type="button" >';
-            str += '</center>';
-            reloadMenu(str)
-          }
-        } else {
-          showError('POST notification/notify',
-                    obj.errorCode, obj.errorMessage);
-        }
-      } else {
-        alert('error:' + myXhr.status);
-      }
-      closeLoading();
+  let inputs = myForm.elements;
+  let params = { serviceId };
+  parseInputElements(inputs, params);
+
+  sdk.post({
+    profile: 'notification',
+    attribute: 'notify',
+    params
+  }).then(json => {
+    closeLoading();
+
+    let str = '';
+    if (myDeviceName.indexOf('Pebble') != -1) {
+    } else if (myDeviceName.indexOf('SmartWatch') != -1) {
+    } else {
+      str += '<center>';
+      str += '<input type="button" onclick="notificationDel(\'' +
+              serviceId + '\',\'' + json.notificationId +
+              '\');" value="Delete" type="button" >';
+      str += '</center>';
+      reloadMenu(str)
     }
-  };
-  myXhr.send(myFormData);
+  }).catch(e => {
+    closeLoading();
+    showError('POST notification/notify', e.errorCode, e.errorMessage);
+  });
 }
 
 /**

dConnectJavascriptApp/js/sdk/util.js

@@ -257,4 +257,22 @@ function toLocaleDateTime(date) {
   let timeStr = date.toLocaleTimeString();
   let msStr = (date.getMilliseconds() / 1000).toFixed(3).slice(2, 5);
   return `${dateStr} ${timeStr}.${msStr}`;
+}
+
+function parseInputElements(inputs, params) {
+  for (let i = 0; i < inputs.length; i++) {
+    let input = inputs[i];
+    if (input.type === 'button') {
+      continue;
+    } else if (input.type === 'file') {
+      if (input.files.length > 0) {
+        params[input.name] = input.files[0];
+      }
+    } else {
+      let value = input.value;
+      if (value !== '') {
+        params[input.name] = value;
+      }
+    }
+  }
 }