🐛 bug: fix memory leaks

Closes #162
kazupon · May 15, 2017 · 95be4ea · 95be4ea · xingchch · Jun 27, 2017
1 parent d328c61
commit 95be4ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 23 deletions.
diff --git a/src/index.js b/src/index.js
@@ -56,37 +56,18 @@ export default class VueI18n {
   }
 
   watchI18nData (fn: Function): Function {
-    this._i18nWatcher = this._vm.$watch('$data', () => {
+    return this._vm.$watch('$data', () => {
       fn && fn()
     }, { deep: true })
-    return this._i18nWatcher
-  }
-
-  unwatchI18nData (): boolean {
-    if (this._i18nWatcher) {
-      this._i18nWatcher()
-      delete this._i18nWatcher
-    }
-    return true
   }
 
   watchLocale (fn: Function): ?Function {
     if (!this._sync || !this._root) { return null }
     const target: any = this._vm
-    this._watcher = this._root.vm.$watch('locale', (val) => {
+    return this._root.vm.$watch('locale', (val) => {
       target.$set(target, 'locale', val)
       fn && fn()
     }, { immediate: true })
-    return this._watcher
-  }
-
-  unwatchLocale (): boolean {
-    if (!this._sync || !this._watcher) { return false }
-    if (this._watcher) {
-      this._watcher()
-      delete this._watcher
-    }
-    return true
   }
 
   get vm (): any { return this._vm }

diff --git a/src/mixin.js b/src/mixin.js
@@ -52,12 +52,12 @@ export default {
     if (!this._i18n) { return }
 
     if (this._i18nWatcher) {
-      this._i18n.unwatchI18nData()
+      this._i18nWatcher()
       delete this._i18nWatcher
     }
 
     if (this._localeWatcher) {
-      this._i18n.unwatchLocale()
+      this._localeWatcher()
       delete this._localeWatcher
     }