bootsy 2.2.1 → 2.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/javascripts/bootsy/modal.js +2 -0
- data/app/assets/stylesheets/bootsy.css +1 -2
- data/app/views/bootsy/images/_loader.html.erb +39 -0
- data/app/views/bootsy/images/_modal.html.erb +1 -1
- data/app/views/bootsy/images/_new.html.erb +1 -1
- data/lib/bootsy/engine.rb +1 -5
- data/lib/bootsy/form_helper.rb +2 -3
- data/lib/bootsy/version.rb +1 -1
- metadata +5 -6
- data/app/assets/images/bootsy/gallery-loader.gif +0 -0
- data/app/assets/images/bootsy/upload-loader.gif +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6f1957bbe60a7a4bfadafed8047f4658eb39ee93
|
4
|
+
data.tar.gz: ac5b53a2c8e6c03bf9566e3ccef91c0d5ab87c70
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f4506e96075bc21d611c1c0bf834613aecff4be208b595fe4a4173f96d89e4b6d490cf681ac227df589001146936c0dd328b45969840d95d60d7f67ff2c8a246
|
7
|
+
data.tar.gz: 0ccbba8b3fe80b608b51d00e346c921ff7d0c827cd429187e2521419e04511ab3fbc7b2f357b33ff30067f05a67b957bd458144b1e5eb92a2cecbb2f07ba4694
|
@@ -134,6 +134,7 @@ Bootsy.Modal.prototype.imageUploadFailed = function(_e, xhr, _status, error) {
|
|
134
134
|
this.validation.text(invalidErrors.image_file[0]);
|
135
135
|
this.$el.find('.bootsy-upload-form').append(this.validation);
|
136
136
|
} else {
|
137
|
+
this.hideGalleryLoadingAnimation();
|
137
138
|
alert($.fn.wysihtml5.locale[this.area.locale].bootsy.error);
|
138
139
|
}
|
139
140
|
|
@@ -149,6 +150,7 @@ Bootsy.Modal.prototype.addImage = function(html) {
|
|
149
150
|
|
150
151
|
// Set image gallery
|
151
152
|
Bootsy.Modal.prototype.requestImageGallery = function() {
|
153
|
+
this.hideRefreshButton();
|
152
154
|
this.showGalleryLoadingAnimation();
|
153
155
|
|
154
156
|
$.ajax({
|
@@ -0,0 +1,39 @@
|
|
1
|
+
<svg width="30px" height="30px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" class="uil-default <%= image_class %>">
|
2
|
+
<rect x="0" y="0" width="100" height="100" fill="none" class="bk"></rect>
|
3
|
+
<rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(0 50 50) translate(0 -30)">
|
4
|
+
<animate attributeName="opacity" from="1" to="0" dur="1s" begin="0s" repeatCount="indefinite"></animate>
|
5
|
+
</rect>
|
6
|
+
<rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(30 50 50) translate(0 -30)">
|
7
|
+
<animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.08333333333333333s" repeatCount="indefinite"></animate>
|
8
|
+
</rect>
|
9
|
+
<rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(60 50 50) translate(0 -30)">
|
10
|
+
<animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.16666666666666666s" repeatCount="indefinite"></animate>
|
11
|
+
</rect>
|
12
|
+
<rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(90 50 50) translate(0 -30)">
|
13
|
+
<animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.25s" repeatCount="indefinite"></animate>
|
14
|
+
</rect>
|
15
|
+
<rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(120 50 50) translate(0 -30)">
|
16
|
+
<animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.3333333333333333s" repeatCount="indefinite"></animate>
|
17
|
+
</rect>
|
18
|
+
<rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(150 50 50) translate(0 -30)">
|
19
|
+
<animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.4166666666666667s" repeatCount="indefinite"></animate>
|
20
|
+
</rect>
|
21
|
+
<rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(180 50 50) translate(0 -30)">
|
22
|
+
<animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.5s" repeatCount="indefinite"></animate>
|
23
|
+
</rect>
|
24
|
+
<rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(210 50 50) translate(0 -30)">
|
25
|
+
<animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.5833333333333334s" repeatCount="indefinite"></animate>
|
26
|
+
</rect>
|
27
|
+
<rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(240 50 50) translate(0 -30)">
|
28
|
+
<animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.6666666666666666s" repeatCount="indefinite"></animate>
|
29
|
+
</rect>
|
30
|
+
<rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(270 50 50) translate(0 -30)">
|
31
|
+
<animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.75s" repeatCount="indefinite"></animate>
|
32
|
+
</rect>
|
33
|
+
<rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(300 50 50) translate(0 -30)">
|
34
|
+
<animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.8333333333333334s" repeatCount="indefinite"></animate>
|
35
|
+
</rect>
|
36
|
+
<rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(330 50 50) translate(0 -30)">
|
37
|
+
<animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.9166666666666666s" repeatCount="indefinite"></animate>
|
38
|
+
</rect>
|
39
|
+
</svg>
|
@@ -2,7 +2,7 @@
|
|
2
2
|
html: { multipart: true, class: 'bootsy-upload-form form-inline' }, data: { type: 'json' }) do |f| %>
|
3
3
|
<%= hidden_field_tag :authenticity_token, form_authenticity_token %>
|
4
4
|
|
5
|
-
<%=
|
5
|
+
<%= render 'bootsy/images/loader', image_class: 'bootsy-upload-loader' %>
|
6
6
|
|
7
7
|
<div class="input-group">
|
8
8
|
<%= f.url_field :remote_image_file_url, class: 'form-control', placeholder: t('bootsy.action.enter_image_url') %>
|
data/lib/bootsy/engine.rb
CHANGED
@@ -16,11 +16,7 @@ module Bootsy
|
|
16
16
|
end
|
17
17
|
|
18
18
|
config.after_initialize do
|
19
|
-
|
20
|
-
orm = BOOTSY_ORM
|
21
|
-
else
|
22
|
-
orm = :activerecord
|
23
|
-
end
|
19
|
+
orm = defined?(BOOTSY_ORM) ? BOOTSY_ORM : :activerecord
|
24
20
|
|
25
21
|
# Require Active Record models. Other ORMs must
|
26
22
|
# include their own Bootsy models.
|
data/lib/bootsy/form_helper.rb
CHANGED
@@ -71,9 +71,8 @@ module Bootsy
|
|
71
71
|
end
|
72
72
|
|
73
73
|
def bootsy_options(options)
|
74
|
-
Bootsy.editor_options
|
75
|
-
|
76
|
-
.merge(uploader: enable_uploader?(options))
|
74
|
+
Bootsy.editor_options.merge(options[:editor_options] || {}).merge(
|
75
|
+
uploader: enable_uploader?(options))
|
77
76
|
end
|
78
77
|
|
79
78
|
def text_area_options(options)
|
data/lib/bootsy/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bootsy
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.2.
|
4
|
+
version: 2.2.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Volmer Soares
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2016-04-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: mini_magick
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '4.
|
19
|
+
version: '4.4'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: '4.
|
26
|
+
version: '4.4'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: carrierwave
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -62,8 +62,6 @@ files:
|
|
62
62
|
- MIT-LICENSE
|
63
63
|
- README.md
|
64
64
|
- Rakefile
|
65
|
-
- app/assets/images/bootsy/gallery-loader.gif
|
66
|
-
- app/assets/images/bootsy/upload-loader.gif
|
67
65
|
- app/assets/javascripts/bootsy.js
|
68
66
|
- app/assets/javascripts/bootsy/area.js
|
69
67
|
- app/assets/javascripts/bootsy/editor_options.js
|
@@ -82,6 +80,7 @@ files:
|
|
82
80
|
- app/helpers/bootsy/application_helper.rb
|
83
81
|
- app/uploaders/bootsy/image_uploader.rb
|
84
82
|
- app/views/bootsy/images/_image.html.erb
|
83
|
+
- app/views/bootsy/images/_loader.html.erb
|
85
84
|
- app/views/bootsy/images/_modal.html.erb
|
86
85
|
- app/views/bootsy/images/_new.html.erb
|
87
86
|
- config/locales/bootsy.en.yml
|
Binary file
|
Binary file
|