Fix 'start' parameter issue.

jaywcjlove · Jun 10, 2018 · e92d6ea · e92d6ea
1 parent f258c6d
commit e92d6ea
Showing 1 changed file with 75 additions and 75 deletions.
diff --git a/index.js b/index.js
@@ -3,118 +3,118 @@ var cursor = require('./lib/cursor');
 var color = require('colors-cli')
 
 function loading(options) {
-    if (!(this instanceof loading)) {
-        return new loading(options)
-    }
-    if (typeof options === 'string') {
-        options = {
-            text: options
-        }
+  if (!(this instanceof loading)) {
+    return new loading(options)
+  }
+  if (typeof options === 'string') {
+    options = {
+        text: options
     }
+  }
 
-    this.options = ut.extend(options, {
-        text: '',
-        color: 'cyan',
-        stream: process.stderr,
-        // stream: process.stdout
-        // loading 样式
-        frames: ["◜", "◠", "◝", "◞", "◡", "◟"]
-    });
+  this.options = ut.extend(options, {
+    text: '',
+    color: 'cyan',
+    stream: process.stderr,
+    // stream: process.stdout
+    // loading 样式
+    frames: ["◜", "◠", "◝", "◞", "◡", "◟"]
+  });
 
-    // 文本显示
-    this.text = this.options.text;
+  // 文本显示
+  this.text = this.options.text;
 
-    // 颜色显示
-    this.color = this.options.color;
+  // 颜色显示
+  this.color = this.options.color;
 
-    // 动画间隔时间
-    this.interval = this.options.interval || 60;
-    this.stream = this.options.stream;
+  // 动画间隔时间
+  this.interval = this.options.interval || 60;
+  this.stream = this.options.stream;
 
-    // loading 样式
-    this.frames = this.options.frames;
+  // loading 样式
+  this.frames = this.options.frames;
 
-    // 不存在
-    this.id = null;
+  // 不存在
+  this.id = null;
 
-    // 要检查 Node 是否正在运行一个 TTY上下文 中
-    // linux 中没有运行在 tty 下的进程是 守护进程
-    this.enabled = this.options.enabled || ((this.stream && this.stream.isTTY) && !process.env.CI);
-    this.frameIndex = 0;
+  // 要检查 Node 是否正在运行一个 TTY上下文 中
+  // linux 中没有运行在 tty 下的进程是 守护进程
+  this.enabled = this.options.enabled || ((this.stream && this.stream.isTTY) && !process.env.CI);
+  this.frameIndex = 0;
 }
 
 loading.prototype.frame = function () {
-    var frames = this.frames;
-    // var frames =  ["◜", "◠", "◝", "◞", "◡", "◟"];
-    // var frames = ["◰", "◳", "◲", "◱"]
-    // var frames = ["◐", "◓", "◑", "◒"]
-    // var frames =  [".", "o", "O", "°", "O", "o", "."]
-    // var frames = ["⊶", "⊷"]
-    // var frames =  ["ဝ", "၀"]
-    // var frames = ["←", "↖", "↑", "↗", "→", "↘", "↓", "↙"]
-    // var frames = ["🕐 ", "🕑 ", "🕒 ", "🕓 ", "🕔 ", "🕕 ", "🕖 ", "🕗 ", "🕘 ", "🕙 ", "🕚 "]
-    var frame = frames[this.frameIndex];
-    if (this.color) {
-        frame = color[this.color](frame);
-    }
-    this.frameIndex = ++this.frameIndex % frames.length;
-    return frame + ' ' + this.text;
+  var frames = this.frames;
+  // var frames =  ["◜", "◠", "◝", "◞", "◡", "◟"];
+  // var frames = ["◰", "◳", "◲", "◱"]
+  // var frames = ["◐", "◓", "◑", "◒"]
+  // var frames =  [".", "o", "O", "°", "O", "o", "."]
+  // var frames = ["⊶", "⊷"]
+  // var frames =  ["ဝ", "၀"]
+  // var frames = ["←", "↖", "↑", "↗", "→", "↘", "↓", "↙"]
+  // var frames = ["🕐 ", "🕑 ", "🕒 ", "🕓 ", "🕔 ", "🕕 ", "🕖 ", "🕗 ", "🕘 ", "🕙 ", "🕚 "]
+  var frame = frames[this.frameIndex];
+  if (this.color) {
+      frame = color[this.color](frame);
+  }
+  this.frameIndex = ++this.frameIndex % frames.length;
+  return frame + ' ' + this.text;
 }
 
 loading.prototype.clear = function () {
 
-    if (!this.enabled) {
-        return this;
-    }
+  if (!this.enabled) {
+    return this;
+  }
 
-    this.stream.clearLine();
-    this.stream.cursorTo(0);
+  this.stream.clearLine();
+  this.stream.cursorTo(0);
 
-    return this;
+  return this;
 }
 
 loading.prototype.render = function () {
-    this.clear();
-    this.stream.write(this.frame());
-    return this;
-
+  this.clear();
+  this.stream.write(this.frame());
+  return this;
 }
 
-loading.prototype.start = function () {
-    if (!this.enabled || this.id) return this;
-    this.clear();
-    cursor.hide(this.stream);
-    this.id = setInterval(this.render.bind(this), this.interval);
-    return this;
+loading.prototype.start = function (text) {
+  if (text) this.text = text;
+  if (!this.enabled || this.id) return this;
+  this.clear();
+  cursor.hide(this.stream);
+  this.id = setInterval(this.render.bind(this), this.interval);
+  return this;
 }
 
 loading.prototype.stop = function () {
-    if (!this.enabled) return this;
-    clearInterval(this.id);
-    this.id = null;
-    this.clear();
-    cursor.show(this.stream);
-    return this;
+  if (!this.enabled) return this;
+  clearInterval(this.id);
+  this.id = null;
+  this.clear();
+  cursor.show(this.stream);
+  return this;
 }
 
 
 loading.prototype.succeed = function (text) {
-    return this.stopAndPersist(color.green('✔'), text);
+  return this.stopAndPersist(color.green('✔'), text);
 }
 loading.prototype.fail = function (text) {
-    return this.stopAndPersist(color.red('✖'), text);
+  return this.stopAndPersist(color.red('✖'), text);
 }
 loading.prototype.warn = function (text) {
-    return this.stopAndPersist(color.yellow('⚠'), text);
+  return this.stopAndPersist(color.yellow('⚠'), text);
 }
 loading.prototype.info = function (text) {
-    return this.stopAndPersist(color.blue('ℹ'), text);
+  return this.stopAndPersist(color.blue('ℹ'), text);
 }
 loading.prototype.stopAndPersist = function (symbol, text) {
-    text = text || this.text
-    this.stop();
-    this.stream.write((symbol ? symbol + ' ' : ' ') + text + '\n');
-    return this;
+  text = text || this.text
+  this.stop();
+  this.stream.write((symbol ? symbol + ' ' : ' ') + text + '\n');
+  return this;
 }
 
 module.exports = loading