social_stream-documents 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14eb2d33b7fcbdd79dd2829dc0f7f552d197248d
-  data.tar.gz: 581cb6aa512adc9c8418b0191a43ea093a180c2f
+  metadata.gz: c42c03de98964b570e7f81e554ee5156c2b44661
+  data.tar.gz: be71420001a10117f803d34188088edc9b05e6c5
 SHA512:
-  metadata.gz: 9c9afbeb4fcf282ec2971e63afa3469a1e619c1ca1f5da6222463926fe9edf59943a3280c84e1198f32d233c3d8d830b4ea8d15abfcdb62c258724b86b79c812
-  data.tar.gz: ea3f6f9bf048bf057601125f1220235e1b1fe4f9872c970d1adb2ace3af205332e4d207c54eeec7568f6abd9eb79226f8570b7807072717d9ac932ac70eb334b
+  metadata.gz: 2741931d8eb58d2ebfd0d05610c5be302d6d4603bb9996eb8659eb00df78fdae40b81ef6f99f127415f406827db4834a3dd0194d5967bd8d6545417292122e25
+  data.tar.gz: 5b84399cc4554171f7295946a7e3985dbaddb109c972f4b008c4da389e77f96e7fabce06421982dd2f2370d4b3e37ab008f0f3d5d927277205c72594f7b122da

data/app/assets/javascripts/social_stream/documents.wall.js

@@ -28,22 +28,37 @@ SocialStream.Documents.Wall = (function(SS, $, undefined) {
     $('.wall_input button.new_document').click(function(event){
       event.preventDefault();
 
-      $('label[for="new_document_title"]').show();
+      $('.wall_input input[type=file]').trigger('click');
+    });
 
-      $('#post_text').
-        attr('name', 'document[title]').
-        attr('placeholder', I18n.t('document.title.input'));
+    $('.wall_input input[type=file]').change(function(){
+      if ($(this).val()) {
+        $('label[for="new_document_title"]').show();
 
-      $('#new_document_description').show().val($('#post_text').val());
+        $('#post_text').
+          attr('name', 'document[title]').
+          attr('placeholder', I18n.t('document.title.input'));
 
-      SocialStream.Wall.changeAction($(this).attr('data-path'));
-      SocialStream.Wall.changeParams('document');
+        $('#new_document_description').show().val($('#post_text').val());
 
-      $('.wall_input input[type=file]').trigger('click');
-    });
+        SocialStream.Wall.changeAction($(this).closest('form').find('button.new_document').attr('data-path'));
+        SocialStream.Wall.changeParams('document');
 
-    $('.wall_input input[type=file]').change(function(){
-      $("#post_text").val($(this).val().replace(/C:\\fakepath\\/i, ''));
+        $("#post_text").val($(this).val().replace(/C:\\fakepath\\/i, ''));
+      } else {
+        $('label[for="new_document_title"]').hide();
+
+        $('#post_text').
+          attr('name', 'post[text]').
+          attr('placeholder', I18n.t('post.input'));
+
+        $('#new_document_description').hide();
+
+        SocialStream.Wall.changeAction();
+        SocialStream.Wall.changeParams();
+
+        $("#post_text").val($('#new_document_description').val());
+      }
     });
   };
 

data/lib/social_stream/documents/engine.rb

@@ -36,7 +36,11 @@ module SocialStream
           Mime::Type.register "image/png",  :png,  [ "image/x-png" ]
         end
         unless defined? Mime::BMP
-          Mime::Type.register "image/bmp",  :bmp
+          Mime::Type.register "image/bmp",  :bmp, [ "image/x-ms-bmp" ]
+        else
+          # Manually register synonym
+          Mime::BMP.instance_variable_get("@synonyms") << "image/x-ms-bmp"
+          Mime::LOOKUP["image/x-ms-bmp"] = Mime::BMP
         end
 
         # Audio

data/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "2.0.2".freeze
+    VERSION = "2.0.3".freeze
   end
 end

data/social_stream-documents.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.0.2')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.3')
 
   s.add_runtime_dependency('paperclip','~> 3.3.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.9.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-documents
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Víctor Sánchez Belmar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement