bootstrap_builders 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbc3d271fd85812e7184bfe1199208425d0defb3
-  data.tar.gz: 9cb7d1be252014ef25249a0ddacd0251978f0044
+  metadata.gz: 778ac130bc4ea3ac5e8982558919a7c5e40479ab
+  data.tar.gz: f4406b4e6ad5682020db3b3af09c6edeff03cfee
 SHA512:
-  metadata.gz: d415e61f0df2dbd8bb8b0ed46943784220621817e86c4d366ec145626a4e33ae7d998c70d0e122a7ed23c80e745b3984f826c2d7a00055b8508d57fca0fc220e
-  data.tar.gz: 5bce943d4bd31304bbf459c7104498b90ba8d8c9120e8d356079003f672e9748d8545fa62d7359ec19bfe646e80bd564c85622b4260a487e256de0a415b070a8
+  metadata.gz: 9c3a62922429251026e92ef8abeaff8a40596aafb9d8f952f0e77e46cd21fcbfc90b17b48f3cce1bb414e6eebb2220eb3795df93980fc237d07b7c3f17d33be9
+  data.tar.gz: ad09dc5126c420d51bb4a8f4a8bdec385cfa35a899255ca40bae01c1b62b1eb72e791bec39019b07d88499732e3ea77a8e3c75c9e2df859733f31ca893b48062

data/app/assets/javascripts/bootstrap_builders/tabs.js

@@ -1,4 +1,7 @@
 function loadAjaxTab(li) {
+  if (li.data("ajax-loaded"))
+    return
+
   var link = $("a", li)
   var content_id = link.attr("href").substring(1, 999)
   var content = $(".bb-tabs-container #" + content_id + " .bb-tab-container")
@@ -7,14 +10,14 @@ function loadAjaxTab(li) {
   content.fadeOut(0, function() {
     $.get(li.data("ajax-url"), function(data) {
       content.html(data)
-      content.fadeIn("fast")
+      content.show()
     })
   })
 }
 
 // Makes sure the correct tab is loaded on page load
 function loadActiveAjaxTabOnPageLoad() {
-  //Loads the dynamic content of a tab when activated and sets the URL to the tab ID
+  // Loads the dynamic content of a tab when activated and sets the URL to the tab ID
   $("body").on("click", ".bb-tabs-container .nav li", function() {
     var li = $(this)
 
@@ -23,12 +26,11 @@ function loadActiveAjaxTabOnPageLoad() {
     } else if(li.data("specific-id-given")) {
       var urlb = new UrlBuilder(window.location.href)
       urlb.queryParameters["bb_selected_tab"] = $(this).data("tab-container-id")
-      window.history.pushState({active_tab: li.data("tab-container-id"), event: "bb-tab-change"}, null, urlb.pathWithQueryParameters())
+      window.history.pushState({active_tab: li.data("tab-container-id"), event: "bb-tab-change", turbolinks: {}}, null, urlb.pathWithQueryParameters())
     }
 
-    if (li.data("ajax-url") && !li.data("ajax-loaded")) {
+    if (li.data("ajax-url"))
       loadAjaxTab(li)
-    }
   })
 
   var activeTabLink = $(".bb-tabs-container .nav li[data-ajax-url] a.active")
@@ -47,9 +49,8 @@ $(document).ready(function() {
       var selected_tab = urlb.queryParameters["bb_selected_tab"]
     }
 
-    if (!selected_tab) {
+    if (!selected_tab)
       selected_tab = $($(".bb-tabs-container .nav li").first()).data("tab-container-id")
-    }
 
     var li = null
     var link = null
@@ -58,7 +59,7 @@ $(document).ready(function() {
       link = $("a", li)
     }
 
-    if (link && !link.hasClass("active")) {
+    if (link && link.length > 0 && !link.hasClass("active")) {
       li.data("ignore-next-history-push", true)
       link.click()
     }

data/lib/bootstrap_builders/version.rb

@@ -1,3 +1,3 @@
 module BootstrapBuilders
-  VERSION = "1.0.1".freeze
+  VERSION = "1.0.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_builders
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2018-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html_gen