plugin event will not be triggered until plugin is ready

huwei765 · Jan 2, 2018 · a09c104 · a09c104
1 parent cb8d301
commit a09c104
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 English | [简体中文](./CHANGELOG_CN.md)
 
+#### V3.1.1-dev (2018-01-xx)
+
+- [FIX] Fix `setOption()` error.
+
+
 #### V3.1.0 (2017-12-27)
 
 - [FEATURE] Add `vConsole.showSwitch()` and `vConsole.hideSwitch()` methods, see [Public Properties & Methods](./doc/public_properties_methods.md).

diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md
@@ -1,5 +1,10 @@
 [English](./CHANGELOG.md) | 简体中文
 
+#### V3.1.1 (2018-01-xx)
+
+- 【修复】修复初始化后立即调用 `setOption` 引起的错误。
+
+
 #### V3.1.0 (2017-12-27)
 
 - 【特性】新增 `vConsole.showSwitch()` 及 `vConsole.hideSwitch()` 方法，请查阅[公共属性及方法](./doc/public_properties_methods_CN.md)。

diff --git a/dist/vconsole.min.js b/dist/vconsole.min.js
diff --git a/example/demo1.html b/example/demo1.html
@@ -45,13 +45,14 @@ <h1 class="page_title">Demo 1</h1>
   defaultPlugins: ['system', 'network', 'element', 'storage'], // 可以在此设定要默认加载的面板
   maxLogNumber: 1000,
   onReady: function() {
-    // console.log('vConsole is ready.');
+    console.log('vConsole is ready.');
   },
   onClearLog: function() {
-    // console.log('on clearLog');
+    console.log('on clearLog');
   }
 });
 
+
 console.info('欢迎使用 vConsole。vConsole 是一个由微信公众平台前端团队研发的 Web 前端开发者面板，可用于展示 console 日志，方便开发、调试。');
 
 $('.js_btn_log').on('tap', function(e) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vconsole",
-  "version": "3.1.0",
+  "version": "3.1.1-dev",
   "description": "A lightweight, extendable front-end developer tool for mobile web page.",
   "homepage": "https://github.com/Tencent/vConsole",
   "main": "dist/vconsole.min.js",

diff --git a/src/core/core.js b/src/core/core.js
@@ -417,6 +417,7 @@ class VConsole {
    */
   _initPlugin(plugin) {
     let that = this;
+    console.debug('_initPlugin');
     plugin.vConsole = this;
     // start init
     plugin.trigger('init');
@@ -496,6 +497,7 @@ class VConsole {
       }
     });
     // end init
+    plugin.isReady = true;
     plugin.trigger('ready');
   }
 
@@ -505,7 +507,9 @@ class VConsole {
    */
   _triggerPluginsEvent(eventName) {
     for (let id in this.pluginList) {
-      this.pluginList[id].trigger(eventName);
+      if (this.pluginList[id].isReady) {
+        this.pluginList[id].trigger(eventName);
+      }
     }
   }
 
@@ -515,7 +519,7 @@ class VConsole {
    */
   _triggerPluginEvent(pluginName, eventName) {
     let plugin = this.pluginList[pluginName];
-    if (plugin) {
+    if (!!plugin && plugin.isReady) {
       plugin.trigger(eventName);
     }
   }
@@ -690,7 +694,7 @@ class VConsole {
     $.removeClass($.all('.vc-tool', this.$dom), 'vc-toggle');
     $.addClass($.all('.vc-tool-' + tabID, this.$dom), 'vc-toggle');
     // trigger plugin event
-    this._triggerPluginEvent(this.activedTab, 'hide');
+    this.activedTab && this._triggerPluginEvent(this.activedTab, 'hide');
     this.activedTab = tabID;
     this._triggerPluginEvent(this.activedTab, 'show');
   }

diff --git a/src/lib/plugin.js b/src/lib/plugin.js
@@ -18,7 +18,8 @@ class VConsolePlugin {
   constructor(id, name = 'newPlugin') {
     this.id = id;
     this.name = name;
-
+    this.isReady = false;
+
     this.eventList = {};
   }