change for eslint

Author: JacksonTian

lib/api_js.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var util = require('./util');
 var crypto = require('crypto');
+
+var util = require('./util');
 var wrapper = util.wrapper;
 
 // 错误码 - Ticket无效
@@ -141,7 +142,9 @@ var raw = function (args) {
   });
 
   var string = '';
-  for (var k in newArgs) {
+  var newKeys = Object.keys(newArgs);
+  for (var i = 0; i < newKeys.length; i++) {
+    var k = newKeys[i];
     string += '&' + k + '=' + newArgs[k];
   }
   return string.substr(1);

lib/api_material.js

@@ -4,10 +4,11 @@ var path = require('path');
 var fs = require('fs');
 
 var formstream = require('formstream');
+
 var util = require('./util');
 var wrapper = util.wrapper;
 var postJSON = util.postJSON;
-
+var make = util.make;
 
 /**
  * 上传永久素材，分别有图片（image）、语音（voice）、和缩略图（thumb）
@@ -35,14 +36,7 @@ var postJSON = util.postJSON;
  * @param {String} type 媒体类型，可用值有image、voice、video、thumb
  * @param {Function} callback 回调函数
  */
-exports.uploadMaterial = function (filepath, type, callback) {
-  this.preRequest(this._uploadMaterial, arguments);
-};
-
-/*!
- * 上传永久文件的未封装版本
- */
-exports._uploadMaterial = function (filepath, type, callback) {
+make(exports, 'uploadMaterial', function (filepath, type, callback) {
   var that = this;
   fs.stat(filepath, function (err, stat) {
     if (err) {
@@ -60,7 +54,7 @@ exports._uploadMaterial = function (filepath, type, callback) {
     };
     that.request(url, opts, wrapper(callback));
   });
-};
+});
 
 ['image', 'voice', 'thumb'].forEach(function (type) {
   var method = 'upload' + type[0].toUpperCase() + type.substring(1) + 'Material';
@@ -94,14 +88,7 @@ exports._uploadMaterial = function (filepath, type, callback) {
  * @param {Object} description 描述
  * @param {Function} callback 回调函数
  */
-exports.uploadVideoMaterial = function (filepath, description, callback) {
-  this.preRequest(this._uploadVideoMaterial, arguments);
-};
-
-/*!
- * 上传永久文件（视频）的未封装版本
- */
-exports._uploadVideoMaterial = function (filepath, description, callback) {
+make(exports, uploadVideoMaterial, function (filepath, description, callback) {
   var that = this;
   fs.stat(filepath, function (err, stat) {
     if (err) {
@@ -120,7 +107,7 @@ exports._uploadVideoMaterial = function (filepath, description, callback) {
     };
     that.request(url, opts, wrapper(callback));
   });
-};
+});
 
 /**
  * 新增永久图文素材
@@ -267,14 +254,12 @@ exports._getMaterial = function (mediaId, callback) {
           err.name = 'WeChatAPIError';
         }
       } catch (ex) {
-        callback(ex, data, res);
-        return;
+        return callback(ex, data, res);
       }
-      callback(err, ret, res);
-    } else {
-      // 输出Buffer对象
-      callback(null, data, res);
+      return callback(err, ret, res);
     }
+    // 输出Buffer对象
+    callback(null, data, res);
   }));
 };
 

lib/api_media.js

@@ -4,6 +4,7 @@ var path = require('path');
 var fs = require('fs');
 
 var formstream = require('formstream');
+
 var util = require('./util');
 var wrapper = util.wrapper;
 
@@ -114,11 +115,10 @@ exports._getMedia = function (mediaId, callback) {
         callback(ex, data, res);
         return;
       }
-      callback(err, ret, res);
-    } else {
-      // 输出Buffer对象
-      callback(null, data, res);
+      return callback(err, ret, res);
     }
+    // 输出Buffer对象
+    callback(null, data, res);
   }));
 };