Merge pull request #26 from tzolkincz/master

fix undefined default slot when rendering complex components
syropian · Feb 9, 2020 · c459034 · c459034
2 parents 8a1e75d + 1e3ef21
commit c459034
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,6 @@ cache:
   yarn: true
   directories:
     - node_modules
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+services:
+  - xvfb
 sudo: false
diff --git a/dist/vue-tribute.cjs.js b/dist/vue-tribute.cjs.js
@@ -19,16 +19,20 @@ var VueTribute = {
       handler: function handler() {
         var _this = this;
 
-        var $el = this.$slots.default[0].elm;
-
         if (this.tribute) {
-          this.tribute.detach($el);
           setTimeout(function () {
-            _this.tribute = new Tribute(_this.options);
+            var $el = _this.$slots.default[0].elm;
+
+            _this.tribute.detach($el);
+
+            setTimeout(function () {
+              var $el = _this.$slots.default[0].elm;
+              _this.tribute = new Tribute(_this.options);
 
-            _this.tribute.attach($el);
+              _this.tribute.attach($el);
 
-            $el.tributeInstance = _this.tribute;
+              $el.tributeInstance = _this.tribute;
+            }, 0);
           }, 0);
         }
       }

diff --git a/dist/vue-tribute.es.js b/dist/vue-tribute.es.js
@@ -15,16 +15,20 @@ var VueTribute = {
       handler: function handler() {
         var _this = this;
 
-        var $el = this.$slots.default[0].elm;
-
         if (this.tribute) {
-          this.tribute.detach($el);
           setTimeout(function () {
-            _this.tribute = new Tribute(_this.options);
+            var $el = _this.$slots.default[0].elm;
+
+            _this.tribute.detach($el);
+
+            setTimeout(function () {
+              var $el = _this.$slots.default[0].elm;
+              _this.tribute = new Tribute(_this.options);
 
-            _this.tribute.attach($el);
+              _this.tribute.attach($el);
 
-            $el.tributeInstance = _this.tribute;
+              $el.tributeInstance = _this.tribute;
+            }, 0);
           }, 0);
         }
       }

diff --git a/dist/vue-tribute.js b/dist/vue-tribute.js
@@ -1810,16 +1810,20 @@
 	      handler: function handler() {
 	        var _this = this;
 
-	        var $el = this.$slots.default[0].elm;
-
 	        if (this.tribute) {
-	          this.tribute.detach($el);
 	          setTimeout(function () {
-	            _this.tribute = new Tribute(_this.options);
+	            var $el = _this.$slots.default[0].elm;
+
+	            _this.tribute.detach($el);
+
+	            setTimeout(function () {
+	              var $el = _this.$slots.default[0].elm;
+	              _this.tribute = new Tribute(_this.options);
 
-	            _this.tribute.attach($el);
+	              _this.tribute.attach($el);
 
-	            $el.tributeInstance = _this.tribute;
+	              $el.tributeInstance = _this.tribute;
+	            }, 0);
 	          }, 0);
 	        }
 	      }

diff --git a/dist/vue-tribute.min.js b/dist/vue-tribute.min.js
diff --git a/dist/vue-tribute.min.js.map b/dist/vue-tribute.min.js.map
diff --git a/src/index.js b/src/index.js
@@ -13,14 +13,18 @@ const VueTribute = {
       immediate: false,
       deep: true,
       handler() {
-        const $el = this.$slots.default[0].elm
         if (this.tribute) {
-          this.tribute.detach($el)
-          setTimeout(() => {
-            this.tribute = new Tribute(this.options)
-            this.tribute.attach($el)
-            $el.tributeInstance = this.tribute
-          }, 0)
+          setTimeout( () => {
+            var $el = this.$slots.default[0].elm;
+            this.tribute.detach($el);
+
+            setTimeout( () => {
+              $el = this.$slots.default[0].elm;
+              this.tribute = new Tribute(this.options);
+              this.tribute.attach($el);
+              $el.tributeInstance = this.tribute;
+            }, 0);
+          }, 0);
         }
       }
     }