smart_listing 1.1.1 → 1.1.2
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f1f5ca088a8f099afb75fbf7e1e1141d616f44ac
|
4
|
+
data.tar.gz: 1f9cf4a2af47ec66b8bddc3f20a5a3dc51064e42
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 262ea9cd10b00b30dd902fe8602637b6af3413919d61bd82b6c0dbc56b23472026f00142dc4e6eec48d6613f3eb006f7ea71dd5d30efabe1983c241514361fef
|
7
|
+
data.tar.gz: c37d66bf5b26b7e336c59a4d1e72f767fefa274fb439b7f10b63bd130e32cc5f5ab020bd298f6d9d72ec3b57a973fa4d60fc17b17ce7d024d979c0a813428e0b
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# Useful when SmartListing target url is different than current one
|
2
2
|
$.rails.href = (element) ->
|
3
|
-
element.attr("href") || element.data("<%= SmartListing.config.data_attributes(:href) %>")
|
3
|
+
element.attr("href") || element.data("<%= SmartListing.config.data_attributes(:href) %>") || window.location.pathname
|
4
4
|
|
5
5
|
class window.SmartListing
|
6
6
|
class Config
|
@@ -33,7 +33,7 @@ class window.SmartListing
|
|
33
33
|
@confirmed = null
|
34
34
|
@popovers = {}
|
35
35
|
|
36
|
-
@container.on "ajax:before", (e) =>
|
36
|
+
@container.on "ajax:before", "#{SmartListing.config.class_name("item_actions")}, #{SmartListing.config.class_name("pagination_container")}", (e) =>
|
37
37
|
@fadeLoading()
|
38
38
|
|
39
39
|
@container.on "ajax:success", (e) =>
|
data/lib/smart_listing/config.rb
CHANGED
@@ -134,7 +134,7 @@ module SmartListing
|
|
134
134
|
@options[:global_options] ||= {}
|
135
135
|
@options[:global_options].merge!(value)
|
136
136
|
end
|
137
|
-
!@options[:global_options]
|
137
|
+
!@options[:global_options] ? DEFAULTS[:global_options] : DEFAULTS[:global_options].deep_merge(@options[:global_options])
|
138
138
|
end
|
139
139
|
|
140
140
|
def to_json
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: smart_listing
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.
|
4
|
+
version: 1.1.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sology
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-04-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|