bootsy 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0213f918a5956944c5acf8b19c39b19d7a8139c3
-  data.tar.gz: 1dc567550503b2daa0105d46261a6b0ec7164bd1
+  metadata.gz: c1ddff8c40bea449166a32a7552f45057683c2c7
+  data.tar.gz: efabca1e49324f70720f65e55d2d16c8074b1018
 SHA512:
-  metadata.gz: 68014bbb2ad7a158a58e2d0fb95b60e560cded6304677fb6f9d4a07313138d460ebd5e1ad1b41aeac547c9d5444b862c80b0d2f2700e907628f9baa408953423
-  data.tar.gz: 4cd2263f8df331ec3dc7ce7df519db0c1632c2bb4181e86d97f6180efb34623a44aa9eae756b2788e687f07b1c88ab075b378cd2e5bc5f7c031a064dc162fe6d
+  metadata.gz: a92ff11d4e8587e2b3dc45a60878c09e061597619ee4ecdc2dc1d262045167f718e5f5c81dc2eba4075655c85222f8088a69e135c42b734518b65e8bfc089d8b
+  data.tar.gz: 8db257d88f60e9236ff75411bc1af7488c6e8705d1208c4c32cb796d37c8d76595369f47c2c4a409c82c9593225fe6e5024a9e75837cac64d639c3dfb6f22be6

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

@@ -1,10 +1,11 @@
 window.Bootsy = window.Bootsy || {};
 
 Bootsy.Area = function($el) {
-  this.$el = $el;
-  this.modal = $el.siblings('.bootsy-modal');
-  this.locale = $el.data('bootsy-locale') || $('html').attr('lang') || 'en';
+  this.$el            = $el;
+  this.modal          = $el.siblings('.bootsy-modal');
+  this.locale         = $el.data('bootsy-locale') || $('html').attr('lang') || 'en';
   this.unsavedChanges = false;
+  this.initialized    = false;
 
   this.options = {
     locale: this.locale,
@@ -189,90 +190,96 @@ Bootsy.Area.prototype.setImageGalleryId = function(id) {
 
 // Init components
 Bootsy.Area.prototype.init = function() {
-  var insert = this.insertImage.bind(this);
-
-  if ((this.options.image === true) && (this.options.uploader === true)) {
-    this.modal.on('click', '.bootsy-image .insert', function(e) {
-      var img, imageObject;
-      var imagePrefix = '/' + $(this).attr('data-image-size') + '_';
-
-      if ($(this).data('image-size') === 'original') {
-        imagePrefix = '/';
-      }
-
-      img = $(this).parents('.bootsy-image').find('img');
-
-      imageObject = {
-        src: img.attr('src').replace('/thumb_', imagePrefix),
-        alt: img.attr('alt').replace('Thumb_', '')
+  var insert;
+
+  if (!this.initialized) {
+    insert = this.insertImage.bind(this);
+
+    if ((this.options.image === true) && (this.options.uploader === true)) {
+      this.modal.on('click', '.bootsy-image .insert', function(e) {
+        var img, imageObject;
+        var imagePrefix = '/' + $(this).attr('data-image-size') + '_';
+
+        if ($(this).data('image-size') === 'original') {
+          imagePrefix = '/';
+        }
+
+        img = $(this).parents('.bootsy-image').find('img');
+
+        imageObject = {
+          src: img.attr('src').replace('/thumb_', imagePrefix),
+          alt: img.attr('alt').replace('Thumb_', '')
+        };
+
+        imageObject.align = $(this).data('position');
+
+        insert(imageObject);
+      });
+
+      // Let's use the uploader, not the static image modal
+      this.options.image = false;
+      this.options.customCommand = true;
+      this.options.customCommandCallback = this.openImagesModal.bind(this);
+      this.options.customTemplates = {
+        customCommand: function(locale, options) {
+          var size = (options && options.size) ? ' btn-'+options.size : '';
+
+          return  '<li>' +
+                    '<a class="btn btn-default ' + size + '" data-wysihtml5-command="customCommand" title="' + locale.image.insert + '" tabindex="-1">' +
+                      '<span class="glyphicon glyphicon-picture"></span>' +
+                    '</a>' +
+                  '</li>';
+        }
       };
 
-      imageObject.align = $(this).data('position');
+      // In order to avoid form nesting
+      this.modal.parents('form').after(this.modal);
 
-      insert(imageObject);
-    });
+      this.modal.on('click', 'a[href="#refresh-gallery"]', this.setImageGallery.bind(this));
 
-    // Let's use the uploader, not the static image modal
-    this.options.image = false;
-    this.options.customCommand = true;
-    this.options.customCommandCallback = this.openImagesModal.bind(this);
-    this.options.customTemplates = {
-      customCommand: function(locale, options) {
-        var size = (options && options.size) ? ' btn-'+options.size : '';
+      this.modal.on('ajax:before', '.destroy-btn', this.showGalleryLoadingAnimation.bind(this));
 
-        return  '<li>' +
-                  '<a class="btn btn-default ' + size + '" data-wysihtml5-command="customCommand" title="' + locale.image.insert + '" tabindex="-1">' +
-                    '<span class="glyphicon glyphicon-picture"></span>' +
-                  '</a>' +
-                '</li>';
-      }
-    };
+      this.modal.on('ajax:success', '.destroy-btn', function(evt, data) {
+        this.deleteImage(data.id);
+      }.bind(this));
 
-    // In order to avoid form nesting
-    this.modal.parents('form').after(this.modal);
+      this.modal.on('ajax:success', '.bootsy-upload-form', function(evt, data) {
+        this.setImageGalleryId(data.gallery_id);
+        this.addImage(data.image);
+        this.setUploadForm(data.form);
+      }.bind(this));
+    }
 
-    this.modal.on('click', 'a[href="#refresh-gallery"]', this.setImageGallery.bind(this));
+    this.editor = this.$el.wysihtml5($.extend(Bootsy.options, this.options)).data('wysihtml5').editor;
 
-    this.modal.on('ajax:before', '.destroy-btn', this.showGalleryLoadingAnimation.bind(this));
+    // Mechanism for unsaved changes alert
+    if (this.options.alertUnsavedChanges !== false) {
+      window.onbeforeunload = this.unsavedChangesAlert.bind(this);
+    }
 
-    this.modal.on('ajax:success', '.destroy-btn', function(evt, data) {
-      this.deleteImage(data.id);
-    }.bind(this));
+    this.$el.closest('form').submit(function(e) {
+      this.unsavedChanges = false;
 
-    this.modal.on('ajax:success', '.bootsy-upload-form', function(evt, data) {
-      this.setImageGalleryId(data.gallery_id);
-      this.addImage(data.image);
-      this.setUploadForm(data.form);
+      return true;
     }.bind(this));
-  }
 
-  this.editor = this.$el.wysihtml5($.extend(Bootsy.options, this.options)).data('wysihtml5').editor;
-
-  // Mechanism for unsaved changes alert
-  if (this.options.alertUnsavedChanges !== false) {
-    window.onbeforeunload = this.unsavedChangesAlert.bind(this);
-  }
-
-  this.$el.closest('form').submit(function(e) {
-    this.unsavedChanges = false;
-
-    return true;
-  }.bind(this));
+    this.editor.on('change', function() {
+      this.unsavedChanges = true;
+    }.bind(this));
 
-  this.editor.on('change', function() {
-    this.unsavedChanges = true;
-  }.bind(this));
+    this.modal.modal({ show: false });
 
-  this.modal.modal({ show: false });
+    this.modal.on('shown.bs.modal', function() {
+      if (this.modal.data('gallery-loaded') !== true) {
+        this.setImageGallery();
+      }
+    }.bind(this));
 
-  this.modal.on('shown.bs.modal', function() {
-    if (this.modal.data('gallery-loaded') !== true) {
-      this.setImageGallery();
-    }
-  }.bind(this));
+    this.modal.on('hide.bs.modal', this.editor.currentView.element.focus);
 
-  this.modal.on('hide.bs.modal', this.editor.currentView.element.focus);
+    this.hideRefreshButton();
+    this.hideEmptyAlert();
 
-  this.hideRefreshButton();
-  this.hideEmptyAlert();
+    this.initialized = true;
+  }
 };

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

@@ -1,13 +1,19 @@
 window.Bootsy = window.Bootsy || {};
 
 Bootsy.init = function() {
-  Bootsy.areas = [];
+  Bootsy.areas = {};
 
-  $('textarea.bootsy_text_area').each(function() {
+  $('textarea.bootsy_text_area').filter(':visible').each(function(index) {
     var area = new Bootsy.Area($(this));
+    var areaIdx = $(this).attr('id') || index;
+
+    if(Bootsy.areas[areaIdx] !== undefined) {
+      areaIdx = $(this).attr('id') + index;
+    }
+
     area.init();
 
-    Bootsy.areas.push(area);
+    Bootsy.areas[areaIdx] = area;
   });
 };
 

data/lib/bootsy/form_builder.rb

@@ -1,7 +1,7 @@
 module Bootsy
   module FormBuilder
     def bootsy_area method, options = {}
-      @template.bootsy_area @object, method, options.merge(object: @object)
+      @template.bootsy_area @object_name, method, objectify_options(options)
     end
   end
 end

data/lib/bootsy/form_helper.rb

@@ -1,21 +1,22 @@
 module Bootsy
   module FormHelper
-    def bootsy_area(object, method, options = {})
+    def bootsy_area(object_name, method, options = {})
+      object    = options[:object]
       container = options.delete(:container)
-      bootsy_options = Bootsy.editor_options.merge(options.delete(:editor_options) || {})
 
+      bootsy_options = Bootsy.editor_options.merge(options.delete(:editor_options) || {})
       bootsy_options[:uploader] = enable_uploader?(object, options.delete(:uploader), container)
 
-      options[:data] = data_options(options, bootsy_options)
+      options[:data]  = data_options(options, bootsy_options)
       options[:class] = class_attr(options)
 
-      output = self.text_area(object_name(object), method, options)
+      output = self.text_area(object_name, method, options)
 
       if bootsy_options[:uploader]
         output += self.render 'bootsy/images/modal', { container: container || object }
 
         if container.blank? || (container == object)
-          output += self.hidden_field(object_name(object), :bootsy_image_gallery_id, class: 'bootsy_image_gallery_id')
+          output += self.hidden_field(object_name, :bootsy_image_gallery_id, class: 'bootsy_image_gallery_id')
         end
       end
 
@@ -27,7 +28,7 @@ module Bootsy
     def enable_uploader?(object, uploader, container)
       if uploader == false
         false
-      elsif container.is_a? Container
+      elsif container.is_a?(Container)
         true
       elsif container.blank? && object.is_a?(Container)
         true
@@ -48,14 +49,6 @@ module Bootsy
       classes << 'bootsy_text_area'
     end
 
-    def object_name(object)
-      if object.is_a?(String) || object.is_a?(Symbol)
-        object
-      else
-        ActiveModel::Naming.param_key(object.class)
-      end
-    end
-
     def data_options(options, bootsy_options)
       (options[:data] || {}).merge Hash[ bootsy_options.map { |k,v| ["bootsy-#{k}", v] } ]
     end

data/lib/bootsy/version.rb

@@ -1,3 +1,3 @@
 module Bootsy
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootsy
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Volmer Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -52,90 +52,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.14'
-- !ruby/object:Gem::Dependency
-  name: factory_girl_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: cucumber-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: shoulda-matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.37'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.37'
 description: A beautiful WYSIWYG editor with image uploads for Rails.
 email:
 - volmerius@gmail.com