thin_man 0.20.3 → 0.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f3a3149a78c919863fc40928cbed440b12e8adbf944532241fd460c5ff8c77a
-  data.tar.gz: a328ba03fef1ea832ff05f9e1fefd7338234b6df4818a53bf3f87858605a30c2
+  metadata.gz: 40dff39c348f32f4f43c034eb305c87691abcd113a50cb618248a3e28ef0b023
+  data.tar.gz: 90ae3bf0fb8632f36988681b4dfeef6adbc0c3d69bca16f4396afebcddb1924b
 SHA512:
-  metadata.gz: 297ff75de6284081cd2f5bde87ce29c30435a4f516df7f8c7d92a55d4b7c81a4bd4bb9577b5a8d1fdd0550160442a6f3132bc7b7e8e14c6393790b1dd01937b6
-  data.tar.gz: 5353f964208f3ad3aaeedf891aab222d4f735c9baf95a59579811252564ab2e52e908c5abdfd97081f779bf44c5676943c7b6c6e31eca762f93f6d88bd028de5
+  metadata.gz: 8c92fb9b47e882d1aa7cb4006086367519b8eaec37f12f4cf4a8e8f8657b74028c175f0855ce77379f9927227bdd9777ee201a70dfcb8a2907080a8b9efcaa83
+  data.tar.gz: a06040297179ba28373aefd2cc77344866995cd34f629c961875bda0186e65e9c89766c36bce77d3cdee294a85f56b916e578a6d623050d0c366eedddcf50980

data/app/assets/javascripts/thin_man.js

@@ -131,12 +131,12 @@ var initThinMan = function() {
         }
       },
       getTarget: function() {
-        var target_selector = this.jq_obj.data('ajax-target');
-        if (target_selector) {
-          if ($(target_selector).length > 0) {
-            this.target = $(target_selector);
+        this.target_selector = this.jq_obj.data('ajax-target');
+        if (this.target_selector) {
+          if ($(this.target_selector).length > 0) {
+            this.target = $(this.target_selector);
           } else {
-            console.log('Warning! Thin Man selector ' + target_selector + ' not found')
+            console.log('Warning! Thin Man selector ' + this.target_selector + ' not found')
           }
         } else {
           console.log('Warning! Thin Man selector not given')
@@ -283,14 +283,16 @@ var initThinMan = function() {
           this.replacement_path = this.replacement_path.slice(1)
         }
         var new_url = [location.protocol, '//', location.host, '/', this.replacement_path].join('')
-        history['replaceState']({}, null, new_url);
+        var new_path = '/' + this.replacement_path
+        history['replaceState']({path: new_path, target: this.target_selector, thin_man: true}, null, new_url);
       },
-      handlePushState: function(){
+      handlePushState: function(){//TODO must implement onPopState handler which is commented out below
         if('/' === this.push_path[0]){
           this.push_path = this.push_path.slice(1)
         }
         var new_url = [location.protocol, '//', location.host, '/', this.push_path].join('')
-        history['pushState']({path: ('/' + this.push_path), target: this.target}, null, new_url);
+        var new_path = '/' + this.push_path
+        history['pushState']({path: new_path, target: this.target_selector, thin_man: true}, null, new_url);
 
       },
       addWatcher: function(watcher) {
@@ -888,16 +890,23 @@ var initThinMan = function() {
       new thin_man.AjaxSorter($(this));
     });
 
-    $(window).bind("popstate", function(e){
-      $('[data-thin-man-back-link]').remove()
-      var previous_state = e.originalEvent.state
-      var $back_link = $('<div>').
-        css({display: 'none'}).
-        attr('data-ajax-target',previous_state.target).
-        attr('href',previous_state.path).
-        attr('data-thin-man-back-link',true)
-      new AjaxLinkSubmission($back_link)
-    })
+    // TODO, make this work to reload content when history changes to previous content loaded by thin_man
+    // and recorded in browser history with pustState
+    // $(window).bind("popstate", function(e){
+      // $('[data-thin-man-back-link]').remove()
+      // var previous_state = e.originalEvent.state
+      // if(previous_state.thin_man && previous_state.path && previous_state.target){
+      //   if($(previous_state.target).length > 0){
+      //     var $this_target = $(previous_state.target)
+      //   }
+      //   var $reload_link = $('<div>').
+      //     css({display: 'none'}).
+      //     attr('data-ajax-target',$this_target).
+      //     attr('href',previous_state.path).
+      //     attr('data-thin-man-back-link',true)
+      //   new thin_man.AjaxLinkSubmission($reload_link)
+      // }
+    // })
 
   });
 

data/lib/thin_man/version.rb

@@ -1,3 +1,3 @@
 module ThinMan
-  VERSION = "0.20.3"
+  VERSION = "0.20.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thin_man
 version: !ruby/object:Gem::Version
-  version: 0.20.3
+  version: 0.20.4
 platform: ruby
 authors:
 - Eric Draut, Adam Bialek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails