comfortable_mexican_sofa 1.6.17 → 1.6.18

data/VERSION

@@ -1 +1 @@
-1.6.17
+1.6.18

data/app/assets/javascripts/comfortable_mexican_sofa/application.js

@@ -91,7 +91,7 @@ $.CMS = function(){
       elRTE.prototype.options.panels.sofa_style     = ['bold', 'italic', 'underline'];
       elRTE.prototype.options.panels.sofa_alignment = ['justifyleft', 'justifycenter', 'justifyright'];
       elRTE.prototype.options.panels.sofa_format    = ['formatblock'];
-      elRTE.prototype.options.panels.sofa_copypaste = ['pasteformattext'];
+      elRTE.prototype.options.panels.sofa_copypaste = ['pastetext'];
       elRTE.prototype.options.panels.sofa_links     = ['sofa_link', 'unlink'];
       
       elRTE.prototype.options.toolbars.sofa = $.CMS.config.elRTE.toolbar;

data/app/assets/javascripts/comfortable_mexican_sofa/elrte/elrte.sofa_image.js

@@ -16,8 +16,14 @@
     
     // attaching event handlers to images
     $(document).on('click', '#cms_dialog .uploaded_files .file_info', function(){
-      self.img_src = $(this).data('url');
-      self.set();
+      console.log($(this))
+      console.log($(this).parents('#cms_dialog'))
+      ui_control = $(this).parents('#cms_dialog').data('ui_control')
+      if (ui_control) {
+        ui_control.img_src = $(this).data('url');
+        ui_control.set();
+        $(this).parents('#cms_dialog').data('ui_control', null)
+      }
       return false;
     });
     
@@ -46,6 +52,8 @@
         success: function(data){
           self.dialog.html(data);
           self.dialog.dialog('open');
+          console.log($(self.dialog))
+          $(self.dialog).data('ui_control', self)
           $.CMS.enable_uploader();
         }
       })

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.6.17"
+  s.version = "1.6.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = "2012-03-24"
+  s.date = "2012-03-27"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.6.17
+  version: 1.6.18
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-24 00:00:00.000000000Z
+date: 2012-03-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70157649574360 !ruby/object:Gem::Requirement
+  requirement: &70136202167420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70157649574360
+  version_requirements: *70136202167420
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70157649573440 !ruby/object:Gem::Requirement
+  requirement: &70136202165640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70157649573440
+  version_requirements: *70136202165640
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70157649572060 !ruby/object:Gem::Requirement
+  requirement: &70136202164120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70157649572060
+  version_requirements: *70136202164120
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -369,7 +369,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1640044306951500333
+      hash: 4174227568118290577
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: