bootsy 0.1.3 → 0.1.4

data/README.md

@@ -1,6 +1,7 @@
-Bootsy
-======
+# Bootsy
+
 [![Build Status](https://secure.travis-ci.org/volmer/bootsy.png?branch=master)](http://travis-ci.org/volmer/bootsy)
+[![Dependency Status](https://gemnasium.com/volmer/bootsy.png)](https://gemnasium.com/volmer/bootsy)
 
 *Bootsy* is a WYSIWYG solution for Rails based on [Bootstrap-wysihtml5](https://github.com/jhollingworth/bootstrap-wysihtml5) which includes image uploads via [CarrierWave](https://github.com/jnicklas/carrierwave).
 

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

@@ -23,47 +23,71 @@ window.Bootsy = (function(){
   }
 
   Bootsy.alertUnsavedChanges = function(){
-    if(unsavedChanges){  
+    if(Bootsy.unsavedChanges){  
       return "<%= I18n.t 'bootsy.js.alert_unsaved' %>"; 
     }
   };
 
   Bootsy.ready = function(){
     if($('textarea.bootsy_text_area').length > 0){
-      element = $('#bootsy_image_gallery');
-      
-      element.parents('form').after(element);
-
-      element.find('a.refresh_btn').live('click', function(e){
-        $(this).hide();
-        Bootsy.progressBar(element);
-      });
-
-      element.find('a.destroy_btn').click(function(e){
-        Bootsy.progressBar(element);
-      });
-
-      // element.find('#new_image').live('ajax:before', function(e){
-      //   console.log('sending...')
-      //   Bootsy.progressBar(element);
-      // });
-
-      element.modal({show: false});
-      element.on('shown', function(){
-        Bootsy.refreshGallery(element);
-      });
 
       Bootsy.editorOptions = {color: true, locale: "<%= I18n.default_locale %>"};
 
       if($('textarea.bootsy_text_area').attr('data-enable-image') == 'false'){
         Bootsy.editorOptions.image = false;
       }else{
-        if($('textarea.bootsy_text_area').attr('data-enable-uploader') == 'false'){
-          Bootsy.editorOptions.image = true;
-        }else{
+
+        if($('textarea.bootsy_text_area').attr('data-enable-uploader') != 'false'){
           Bootsy.editorOptions.image = false;
           Bootsy.editorOptions.imageUpload = true;
           Bootsy.editorOptions.imageUploadCallback = Bootsy.openImageGallery;
+
+          element = $('#bootsy_image_gallery');
+        
+          element.parents('form').after(element);
+
+          element.find('a.refresh_btn').live('click', function(e){
+            $(this).hide();
+            Bootsy.progressBar(element);
+          });
+
+          element.find('a.destroy_btn').click(function(e){
+            Bootsy.progressBar(element);
+          });
+
+          // element.find('#new_image').live('ajax:before', function(e){
+          //   console.log('sending...')
+          //   Bootsy.progressBar(element);
+          // });
+
+          element.modal({show: false});
+          element.on('shown', function(){
+            Bootsy.refreshGallery(element);
+          });
+
+          element.on('hide', function() {
+            Bootsy.editor.currentView.element.focus();
+          });
+
+          element.on('click.dismiss.modal', '[data-dismiss="modal"]', function(e) {
+            e.stopPropagation();
+          });
+
+          element.find('ul.dropdown-menu a.insert').live('click', function(e){
+            var imagePrefix = "/"+$(this).attr('data-image-size')+"_";
+            if($(this).attr('data-image-size') == 'original'){
+              imagePrefix = '/';
+            }
+            var img = $(this).parents('li.dropdown').find('img');
+            var obj = {
+              src: img.attr('src').replace("/thumb_", imagePrefix),
+              alt: img.attr('alt').replace("Thumb_", "")
+            };
+
+            obj.align = $(this).attr('data-position');
+
+            Bootsy.insertImage(obj, Bootsy.editor);
+          });
         }
       }
 
@@ -76,29 +100,15 @@ window.Bootsy = (function(){
 
       Bootsy.editor = $('textarea.bootsy_text_area').wysihtml5(Bootsy.editorOptions).data("wysihtml5").editor;
 
-      element.on('hide', function() {
-        Bootsy.editor.currentView.element.focus();
-      });
-
-      element.on('click.dismiss.modal', '[data-dismiss="modal"]', function(e) {
+      // In order to properly work with Twitter Bootstrap 2.1
+      $('body').off('click.dropdown touchstart.dropdown.data-api', '.dropdown');
+      $('body').on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function(e){ 
         e.stopPropagation();
       });
 
-      element.find('ul.dropdown-menu a.insert').live('click', function(e){
-        var imagePrefix = "/"+$(this).attr('data-image-size')+"_";
-        if($(this).attr('data-image-size') == 'original'){
-          imagePrefix = '/';
-        }
-        var img = $(this).parents('li.dropdown').find('img');
-        var obj = {
-          src: img.attr('src').replace("/thumb_", imagePrefix),
-          alt: img.attr('alt').replace("Thumb_", "")
-        };
-
-        obj.align = $(this).attr('data-position');
-
-        Bootsy.insertImage(obj, Bootsy.editor);
-      });
+      if($('textarea.bootsy_text_area').attr('data-alert-unsaved') != 'false'){
+        window.onbeforeunload = Bootsy.alertUnsavedChanges;
+      }
 
       Bootsy.editor.on("change", function(){
         Bootsy.unsavedChanges = true;
@@ -108,16 +118,6 @@ window.Bootsy = (function(){
         Bootsy.unsavedChanges = false;
         return true;
       });
-
-      // In order to properly work with Twitter Bootstrap 2.1
-      $('body').off('click.dropdown touchstart.dropdown.data-api', '.dropdown');
-      $('body').on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function(e){ 
-        e.stopPropagation();
-      });
-
-      if($('textarea.bootsy_text_area').attr('data-alert-unsaved') != 'false'){
-        window.onbeforeunload = Bootsy.alertUnsavedChanges;
-      }
     }
   };
 

data/lib/bootsy/form_helper.rb

@@ -2,44 +2,42 @@ module Bootsy
   module FormHelper
     def bootsy_area object, method, options = {}
 
-      container = options.delete :container
+      foreign_container = options.delete :container
+      enable_uploader = true
 
-      unless container.kind_of?(Container) || (container.nil? && object.kind_of?(Container))
-        options[:editor_options] = {uploader: false}
+      unless foreign_container.kind_of?(Container) || (foreign_container.nil? && object.kind_of?(Container))
+        enable_uploader = false
       end
 
       editor_options = options.delete :editor_options
 
       unless editor_options.nil?
-        
-        options[:'data-enable-uploader'] = 'false' if editor_options[:uploader] == false
-
+        enable_uploader = false if editor_options[:uploader] == false
         options[:'data-alert-unsaved'] = 'false' if editor_options[:alert_unsaved] == false
-      
         options[:'data-enable-font-styles'] = 'false' if editor_options[:font_styles] == false
-      
         options[:'data-enable-emphasis'] = 'false' if editor_options[:emphasis] == false
-      
         options[:'data-enable-lists'] = 'false' if editor_options[:lists] == false
-      
         options[:'data-enable-html'] = 'true' if editor_options[:html] == true
-      
         options[:'data-enable-link'] = 'false' if editor_options[:link] == false
-      
         options[:'data-enable-image'] = 'false' if editor_options[:image] == false
-      
         options[:'data-enable-color'] = 'false' if editor_options[:color] == false
-        
       end
 
+      options[:'data-enable-uploader'] = 'false' unless enable_uploader
+
       object_name = object.class.name.underscore
+
+      output = raw ''
       
-      output = self.render 'bootsy/images/modal', {container: container || object}
+      output = self.render 'bootsy/images/modal', {container: foreign_container || object} if enable_uploader
+
       options[:class] = (options[:class].nil? ? [] : (options[:class].kind_of?(Array) ? options[:class] : [options[:class]])) + [:bootsy_text_area]
       output += self.text_area object_name, method, options
 
-      if container.nil? || (container == object)
-        output += self.hidden_field object_name, :bootsy_image_gallery_id, :class => 'bootsy_image_gallery_id'
+      if enable_uploader
+        if foreign_container.nil? || (foreign_container == object)
+          output += self.hidden_field object_name, :bootsy_image_gallery_id, :class => 'bootsy_image_gallery_id'
+        end
       end
       
       output

data/lib/bootsy/version.rb

@@ -1,3 +1,3 @@
 module Bootsy
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootsy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -163,44 +163,44 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/uploaders/bootsy/image_uploader.rb
-- app/views/bootsy/images/_index.html.erb
-- app/views/bootsy/images/_new.html.erb
 - app/views/bootsy/images/index.js.erb
-- app/views/bootsy/images/_modal.html.erb
-- app/views/bootsy/images/create.js.erb
+- app/views/bootsy/images/_index.html.erb
 - app/views/bootsy/images/destroy.js.erb
+- app/views/bootsy/images/create.js.erb
+- app/views/bootsy/images/_modal.html.erb
+- app/views/bootsy/images/_new.html.erb
 - app/controllers/bootsy/application_controller.rb
 - app/controllers/bootsy/images_controller.rb
+- app/helpers/bootsy/application_helper.rb
 - app/assets/javascripts/bootsy.js
-- app/assets/javascripts/bootsy/bootsy.js.erb
-- app/assets/javascripts/bootsy/bootstrap-wysihtml5.js
-- app/assets/javascripts/bootsy/wysihtml5.js
 - app/assets/javascripts/bootsy/locales/bootstrap-wysihtml5.pt-BR.js
+- app/assets/javascripts/bootsy/wysihtml5.js
+- app/assets/javascripts/bootsy/bootstrap-wysihtml5.js
+- app/assets/javascripts/bootsy/bootsy.js.erb
 - app/assets/stylesheets/bootsy.css
 - app/assets/stylesheets/bootsy/bootstrap-wysihtml5.css
 - app/assets/stylesheets/bootsy/bootsy.css
-- app/helpers/bootsy/application_helper.rb
-- config/cucumber.yml
-- config/bootsy.yml
-- config/routes.rb
-- config/locales/pt-BR.yml
 - config/locales/en.yml
-- db/migrate/20120628124845_create_bootsy_image_galleries.rb
+- config/locales/pt-BR.yml
+- config/routes.rb
+- config/bootsy.yml
+- config/cucumber.yml
 - db/migrate/20120624171333_create_bootsy_images.rb
-- lib/tasks/bootsy_tasks.rake
-- lib/tasks/cucumber.rake
-- lib/generators/bootsy/USAGE
+- db/migrate/20120628124845_create_bootsy_image_galleries.rb
 - lib/generators/bootsy/install_generator.rb
 - lib/generators/bootsy/templates/bootsy.rb
+- lib/generators/bootsy/USAGE
 - lib/bootsy.rb
-- lib/bootsy/core_ext.rb
-- lib/bootsy/activerecord/image_gallery.rb
-- lib/bootsy/activerecord/image.rb
+- lib/tasks/bootsy_tasks.rake
+- lib/tasks/cucumber.rake
 - lib/bootsy/form_helper.rb
 - lib/bootsy/version.rb
+- lib/bootsy/activerecord/image_gallery.rb
+- lib/bootsy/activerecord/image.rb
+- lib/bootsy/core_ext.rb
 - lib/bootsy/container.rb
-- lib/bootsy/engine.rb
 - lib/bootsy/form_builder.rb
+- lib/bootsy/engine.rb
 - MIT-LICENSE
 - Rakefile
 - README.md
@@ -218,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 475960961
+      hash: 1343926653393299360
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 475960961
+      hash: 1343926653393299360
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24