tb_banners 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a46f87c6d2c6bc161da7d1d2948d5a601e986298
-  data.tar.gz: 2a84a2035397ceef9899c8411c212f798f8cb029
+  metadata.gz: 50d873e8b6bba3f5f08288918c8100c5546b9057
+  data.tar.gz: daadd24a362d3186dfebb7f5dcb394472f0260c2
 SHA512:
-  metadata.gz: e45015bd7458996b6d8e3fcc3a84526462cbcb38416030ac75998cffa4883169eee1dc55a4b1c2e4780dbda3391360be84d64c0d792df75eb4c1b0e504d334cf
-  data.tar.gz: b050dd66e50d72322c0a9b379d48b5685c73124416c1d4f4210b61702bdd33c12af616c793011e10182fbfd19913abcbef26d729aafbd973501a35d76291b2a3
+  metadata.gz: 2482155bf98292c20eb8a57b25f90f5d3a530543a548e0e4b8a5e7cae11b23f685e9e892e9e82a339ee782e4768450aaabc3b6da0d76c137d60d1c4d67da3de0
+  data.tar.gz: 3b054e98e9dd8d2f4bc2de4ae5f07dc98985d5ba8ed1dc4bb40030fa957a3e1b89619ddb82cd1a5fe6109c3d4e0aac1ea8d07c6ca360c8d27d045a70a3b6f7be

data/README.markdown

@@ -48,7 +48,12 @@ A number of view helpers are provided for displaying banners in your templates.
 
 `spud_banners_for_set(set_or_identifier, options)`
 
-Accepts the banner set name as a String or Symbol and returns an html template. Options hash accepts a `:limit` parameter for limiting the number of banners returned. This helper also accepts a block argument for rendering custom html.
+Accepts the banner set name as a String or Symbol and returns an html template. This helper also accepts a block argument for rendering custom html.
+
+**Options:**
+
+- `limit`: Limit how many banners you wish to render
+- `background_image`: Pass `true` in order to render the banners as divs with css background images instead of image tags. Defaults to `false`. **This is required when rendering banners with rich text.**
 
 ```ruby
 spud_banner_tag(banner)

data/app/assets/javascripts/admin/banners/banners.js

@@ -23,6 +23,20 @@ spud.admin.banners = new function(){
       stop: self.sortedBanners,
       helper: fixHelper
     });
+
+    /*
+    * Workaround for bug when using Bootstrap 2 + Tinymce 4 that prevents the creation of hyperlinks while
+    * running in a modal dialog
+    *
+    * See: http://stackoverflow.com/questions/18111582/tinymce-4-links-plugin-modal-in-not-editable
+    *
+    * NOTE: REMOVE THIS CODE WHEN UPGRADING TO BOOTSTRAP 3
+    */
+    $(document).on('focusin', function(e) {
+      if($(e.target).closest(".mce-window").length){
+        e.stopImmediatePropagation();
+      }
+    });
   };
 
   // http://www.foliotek.com/devblog/make-table-rows-sortable-using-jquery-ui-sortable/
@@ -44,6 +58,7 @@ spud.admin.banners = new function(){
           title: 'Upload Banner',
           html: html
         });
+        initForm();
       }
     });
   };
@@ -60,6 +75,7 @@ spud.admin.banners = new function(){
           title: 'Edit Banner',
           html: html
         });
+        initForm();
       }
     });
   };
@@ -167,6 +183,7 @@ spud.admin.banners = new function(){
 
   self.onLegacyUploadError = function(html){
     $('.spud_banner_form').replaceWith(html);
+    initForm();
   };
 
   self.sortedBanners = function(e, ui){
@@ -184,9 +201,10 @@ spud.admin.banners = new function(){
   // Form Page
   ////////////
 
-  this.form = function(){
+  var initForm = function(){
     var richText = $('#spud_banner_rich_text');
     if(richText){
+      tinymce.EditorManager.execCommand('mceRemoveEditor', true, 'spud_banner_rich_text');
       spud.admin.editor.init({
         selector: '#spud_banner_rich_text',
         buttons: ['bold','italic','underline','formatselect','|','bullist','numlist','|','link','unlink','anchor', '|', 'code'],
@@ -195,4 +213,5 @@ spud.admin.banners = new function(){
       });
     }
   };
+
 }();

data/app/views/admin/banners/_form.html.erb

@@ -67,7 +67,3 @@
 <% end %>
 
 <iframe id="spud_banners_upload_target" name="spud_banners_upload_target" style="display:none;"></iframe>
-
-<script>
-  $(document).ready(spud.admin.banners.form);
-</script>

data/lib/spud_banners/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Banners
-    VERSION = "1.1.5"
+    VERSION = "1.1.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_banners
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Westlake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Twice Baked Banners