bootsy 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc0d3d886ed83b6d649b9fb22d4a6298a59f0254
-  data.tar.gz: d85216d19292829dcc8a2eae22bef6e558f561c8
+  metadata.gz: 6f1957bbe60a7a4bfadafed8047f4658eb39ee93
+  data.tar.gz: ac5b53a2c8e6c03bf9566e3ccef91c0d5ab87c70
 SHA512:
-  metadata.gz: 5dcce405cb0d224ea4c9fde9577df2b99bc8c69e1b6bf702978a5cfbfcee3c93818b673bf16e0b681cfce3dcd0e84b13d2961c4fc60796d2e4d8a6f516772a54
-  data.tar.gz: f011a536e7034442c36d268913539475a4a64baf5b2487ece5d0f72ec5a72cb15bae2a464b10a7214d462dcb6b6793cc34d690c7795ada05514ac54325b2b57c
+  metadata.gz: f4506e96075bc21d611c1c0bf834613aecff4be208b595fe4a4173f96d89e4b6d490cf681ac227df589001146936c0dd328b45969840d95d60d7f67ff2c8a246
+  data.tar.gz: 0ccbba8b3fe80b608b51d00e346c921ff7d0c827cd429187e2521419e04511ab3fbc7b2f357b33ff30067f05a67b957bd458144b1e5eb92a2cecbb2f07ba4694

data/app/assets/javascripts/bootsy/modal.js

@@ -134,6 +134,7 @@ Bootsy.Modal.prototype.imageUploadFailed = function(_e, xhr, _status, error) {
     this.validation.text(invalidErrors.image_file[0]);
     this.$el.find('.bootsy-upload-form').append(this.validation);
   } else {
+    this.hideGalleryLoadingAnimation();
     alert($.fn.wysihtml5.locale[this.area.locale].bootsy.error);
   }
 
@@ -149,6 +150,7 @@ Bootsy.Modal.prototype.addImage = function(html) {
 
 // Set image gallery
 Bootsy.Modal.prototype.requestImageGallery = function() {
+  this.hideRefreshButton();
   this.showGalleryLoadingAnimation();
 
   $.ajax({

data/app/assets/stylesheets/bootsy.css

@@ -310,8 +310,7 @@ textarea.bootsy:required:invalid {
 }
 
 .bootsy-upload-loader {
-  display: inline-block;
-  padding-right: 5px;
+  margin: 0 10px -10px 0;
 }
 
 .bootsy-upload-spacer {

data/app/views/bootsy/images/_loader.html.erb

@@ -0,0 +1,39 @@
+<svg width="30px" height="30px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" class="uil-default <%= image_class %>">
+  <rect x="0" y="0" width="100" height="100" fill="none" class="bk"></rect>
+  <rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(0 50 50) translate(0 -30)">
+    <animate attributeName="opacity" from="1" to="0" dur="1s" begin="0s" repeatCount="indefinite"></animate>
+  </rect>
+  <rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(30 50 50) translate(0 -30)">
+    <animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.08333333333333333s" repeatCount="indefinite"></animate>
+  </rect>
+  <rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(60 50 50) translate(0 -30)">
+    <animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.16666666666666666s" repeatCount="indefinite"></animate>
+  </rect>
+  <rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(90 50 50) translate(0 -30)">
+    <animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.25s" repeatCount="indefinite"></animate>
+  </rect>
+  <rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(120 50 50) translate(0 -30)">
+    <animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.3333333333333333s" repeatCount="indefinite"></animate>
+  </rect>
+  <rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(150 50 50) translate(0 -30)">
+    <animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.4166666666666667s" repeatCount="indefinite"></animate>
+  </rect>
+  <rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(180 50 50) translate(0 -30)">
+    <animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.5s" repeatCount="indefinite"></animate>
+  </rect>
+  <rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(210 50 50) translate(0 -30)">
+    <animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.5833333333333334s" repeatCount="indefinite"></animate>
+  </rect>
+  <rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(240 50 50) translate(0 -30)">
+    <animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.6666666666666666s" repeatCount="indefinite"></animate>
+  </rect>
+  <rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(270 50 50) translate(0 -30)">
+    <animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.75s" repeatCount="indefinite"></animate>
+  </rect>
+  <rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(300 50 50) translate(0 -30)">
+    <animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.8333333333333334s" repeatCount="indefinite"></animate>
+  </rect>
+  <rect x="46.5" y="40" width="7" height="20" rx="5" ry="5" fill="#ccc" transform="rotate(330 50 50) translate(0 -30)">
+    <animate attributeName="opacity" from="1" to="0" dur="1s" begin="0.9166666666666666s" repeatCount="indefinite"></animate>
+  </rect>
+</svg>

data/app/views/bootsy/images/_modal.html.erb

@@ -17,7 +17,7 @@
 
         <div class="row bootsy-gallery"></div>
 
-        <%= image_tag 'bootsy/gallery-loader.gif', class: 'bootsy-gallery-loader' %>
+        <%= render 'bootsy/images/loader', image_class: 'bootsy-gallery-loader' %>
 
         <%= refresh_btn %>
       </div>

data/app/views/bootsy/images/_new.html.erb

@@ -2,7 +2,7 @@
   html: { multipart: true, class: 'bootsy-upload-form form-inline' }, data: { type: 'json' }) do |f| %>
   <%= hidden_field_tag :authenticity_token, form_authenticity_token %>
 
-  <%= image_tag 'bootsy/upload-loader.gif', class: 'bootsy-upload-loader' %>
+  <%= render 'bootsy/images/loader', image_class: 'bootsy-upload-loader' %>
 
   <div class="input-group">
     <%= f.url_field :remote_image_file_url, class: 'form-control', placeholder: t('bootsy.action.enter_image_url') %>

data/lib/bootsy/engine.rb

@@ -16,11 +16,7 @@ module Bootsy
     end
 
     config.after_initialize do
-      if defined?(BOOTSY_ORM)
-        orm = BOOTSY_ORM
-      else
-        orm = :activerecord
-      end
+      orm = defined?(BOOTSY_ORM) ? BOOTSY_ORM : :activerecord
 
       # Require Active Record models. Other ORMs must
       # include their own Bootsy models.

data/lib/bootsy/form_helper.rb

@@ -71,9 +71,8 @@ module Bootsy
     end
 
     def bootsy_options(options)
-      Bootsy.editor_options
-        .merge(options[:editor_options] || {})
-        .merge(uploader: enable_uploader?(options))
+      Bootsy.editor_options.merge(options[:editor_options] || {}).merge(
+        uploader: enable_uploader?(options))
     end
 
     def text_area_options(options)

data/lib/bootsy/version.rb

@@ -1,4 +1,4 @@
 # Public: The gem version
 module Bootsy
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootsy
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Volmer Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -62,8 +62,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/images/bootsy/gallery-loader.gif
-- app/assets/images/bootsy/upload-loader.gif
 - app/assets/javascripts/bootsy.js
 - app/assets/javascripts/bootsy/area.js
 - app/assets/javascripts/bootsy/editor_options.js
@@ -82,6 +80,7 @@ files:
 - app/helpers/bootsy/application_helper.rb
 - app/uploaders/bootsy/image_uploader.rb
 - app/views/bootsy/images/_image.html.erb
+- app/views/bootsy/images/_loader.html.erb
 - app/views/bootsy/images/_modal.html.erb
 - app/views/bootsy/images/_new.html.erb
 - config/locales/bootsy.en.yml