From 47cad2c6380de222bfc4ef31e172b438f4c3328e Mon Sep 17 00:00:00 2001
From: surunzi <surunzi@foxmail.com>
Date: Sat, 27 Aug 2016 20:54:11 +0800
Subject: [PATCH] Fix: Small bugs

---
 src/Console/Console.es6 |  6 +++---
 src/Console/Log.es6     |  8 ++++----
 src/Console/Log.hbs     |  2 +-
 src/Console/Logger.es6  | 14 +++++++++++---
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/Console/Console.es6 b/src/Console/Console.es6
index 4e7f4b8..513ad7f 100644
--- a/src/Console/Console.es6
+++ b/src/Console/Console.es6
@@ -197,9 +197,9 @@ export default class Console extends Tool
 
         if (cfg.get('catchGlobalErr')) this.catchGlobalErr();
         if (cfg.get('overrideConsole')) this.overrideConsole();
-        if (cfg.get('displayExtraInfo')) logger.displayHeader(true);
-        if (cfg.get('displayUnenumerable')) logger.displayUnenumerable(true);
-        if (cfg.get('displayGetterVal')) logger.displayGetterVal(true);
+        logger.displayHeader(cfg.get('displayExtraInfo'));
+        logger.displayUnenumerable(cfg.get('displayUnenumerable'));
+        logger.displayGetterVal(cfg.get('displayGetterVal'));
         logger.maxNum(maxLogNum);
 
         cfg.on('change', (key, val) =>
diff --git a/src/Console/Log.es6 b/src/Console/Log.es6
index 52d50e2..9508898 100644
--- a/src/Console/Log.es6
+++ b/src/Console/Log.es6
@@ -9,14 +9,14 @@ export default class Log
     constructor({
         type = 'log',
         args = [],
-        idx = 0,
+        id,
         displayHeader = false,
         ignoreFilter = false})
     {
         this.type = type;
         this.args = args;
-        this.idx = idx;
         this.count = 1;
+        this.id = id;
         this.displayHeader = displayHeader;
         this.ignoreFilter = ignoreFilter;
 
@@ -73,7 +73,7 @@ export default class Log
     }
     _formatMsg()
     {
-        let {type, idx, displayHeader, time, from, args} = this;
+        let {type, id, displayHeader, time, from, args} = this;
 
         if (this._needSrc())
         {
@@ -126,7 +126,7 @@ export default class Log
         }
 
         this.value = msg;
-        msg = render({msg, type, icon, idx, displayHeader, time, from});
+        msg = render({msg, type, icon, id, displayHeader, time, from});
 
         delete this.args;
         this.formattedMsg = msg;
diff --git a/src/Console/Log.hbs b/src/Console/Log.hbs
index c669353..6a8e906 100644
--- a/src/Console/Log.hbs
+++ b/src/Console/Log.hbs
@@ -4,7 +4,7 @@
             <span data-mark="time">{{time}}</span> <span>{{from}}</span>
         </div>
     {{/if}}
-    <div class="eruda-{{type}} eruda-log-item" data-idx="{{idx}}" data-type="{{type}}">
+    <div class="eruda-{{type}} eruda-log-item" data-id="{{id}}" data-type="{{type}}">
         {{#if icon}}
             <div class="eruda-icon-container">
                 <span class="eruda-icon eruda-icon-{{icon}}"></span>
diff --git a/src/Console/Logger.es6 b/src/Console/Logger.es6
index 5e6076d..3b0dded 100644
--- a/src/Console/Logger.es6
+++ b/src/Console/Logger.es6
@@ -206,7 +206,7 @@ export default class Logger extends util.Emitter
 
         let options = util.isStr(type) ? {type, args} : type;
         util.extend(options, {
-            idx: logs.length,
+            id: util.uniqId('log'),
             displayHeader: this._displayHeader
         });
 
@@ -304,9 +304,17 @@ export default class Logger extends util.Emitter
         this._$el.on('click', '.eruda-log-item', function ()
         {
             let $el = util.$(this),
-                idx = $el.data('idx'),
+                id = $el.data('id'),
                 type = $el.data('type'),
-                log = self._logs[idx];
+                logs = self._logs,
+                log;
+
+            for (let i = 0, len = logs.length; i < len; i++)
+            {
+                log = logs[i];
+                if (log.id === id) break;
+            }
+            if (!log) return;
 
             let action = Log.click(type, log, $el);