update

yoxjs · Jun 12, 2018 · ca6940a · ca6940a
1 parent b729a14
commit ca6940a
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 23 deletions.
diff --git a/dist/yox-legacy.js b/dist/yox-legacy.js
@@ -6240,15 +6240,16 @@ var Yox = function () {
       instance.updateView(instance.get(TEMPLATE_COMPUTED), el || api.createElement('div'));
     }
 
+    if (events) {
+      instance.on(events);
+    }
+
     // 确保早于 AFTER_MOUNT 执行
-    if (watchers || events) {
+    if (watchers) {
       prepend(function () {
-        if (watchers && instance.$observer) {
+        if (instance.$observer) {
           instance.watch(watchers);
         }
-        if (events && instance.$emitter) {
-          instance.on(events);
-        }
       });
     }
   }
@@ -6856,7 +6857,7 @@ var Yox = function () {
   return Yox;
 }();
 
-Yox.version = '0.59.8';
+Yox.version = '0.59.9';
 
 /**
  * 工具，便于扩展、插件使用

diff --git a/dist/yox-legacy.js.map b/dist/yox-legacy.js.map
diff --git a/dist/yox-legacy.min.js b/dist/yox-legacy.min.js
diff --git a/dist/yox.js b/dist/yox.js
@@ -6078,15 +6078,16 @@ var Yox = function () {
       instance.updateView(instance.get(TEMPLATE_COMPUTED), el || api.createElement('div'));
     }
 
+    if (events) {
+      instance.on(events);
+    }
+
     // 确保早于 AFTER_MOUNT 执行
-    if (watchers || events) {
+    if (watchers) {
       prepend(function () {
-        if (watchers && instance.$observer) {
+        if (instance.$observer) {
           instance.watch(watchers);
         }
-        if (events && instance.$emitter) {
-          instance.on(events);
-        }
       });
     }
   }
@@ -6694,7 +6695,7 @@ var Yox = function () {
   return Yox;
 }();
 
-Yox.version = '0.59.8';
+Yox.version = '0.59.9';
 
 /**
  * 工具，便于扩展、插件使用

diff --git a/dist/yox.js.map b/dist/yox.js.map
diff --git a/dist/yox.min.js b/dist/yox.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yox",
-  "version": "0.59.8",
+  "version": "0.59.9",
   "description": "A lightweight mvvm framework",
   "main": "dist/yox.js",
   "directories": {

diff --git a/src/Yox.js b/src/Yox.js
@@ -223,16 +223,17 @@ export default class Yox {
       )
     }
 
+    if (events) {
+      instance.on(events)
+    }
+
     // 确保早于 AFTER_MOUNT 执行
-    if (watchers || events) {
+    if (watchers) {
       nextTask.prepend(
         function () {
-          if (watchers && instance.$observer) {
+          if (instance.$observer) {
             instance.watch(watchers)
           }
-          if (events && instance.$emitter) {
-            instance.on(events)
-          }
         }
       )
     }
@@ -820,7 +821,7 @@ export default class Yox {
  *
  * @type {string}
  */
-Yox.version = '0.59.8'
+Yox.version = '0.59.9'
 
 /**
  * 工具，便于扩展、插件使用